diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 5ffec7f75bfa87431ca8e4eeb0c485015d3917dd..1a5215ca309860a58899e7b145d13767f92c831d 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -62,7 +62,7 @@ class ApplicationController < ActionController::Base
end
end
- def after_sign_in_path_for resource
+ def after_sign_in_path_for(resource)
if resource.is_a?(User) && resource.respond_to?(:blocked?) && resource.blocked?
sign_out resource
flash[:alert] = "Your account is blocked. Retry when an admin has unblocked it."
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 9e70978992f265bb5c7c49abaa27b8d6d2aad447..6d3214b70a8b1ffb74474b4d6a652745d357ba89 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -15,11 +15,11 @@ class RegistrationsController < Devise::RegistrationsController
super
end
- def after_sign_up_path_for resource
+ def after_sign_up_path_for(resource)
new_user_session_path
end
- def after_inactive_sign_up_path_for resource
+ def after_inactive_sign_up_path_for(resource)
new_user_session_path
end
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 6f738764b0e5f5e239a70d970393cc3ee524129d..10a895d8cae67d11ef3fe1a705f0a8917c7154fd 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -19,7 +19,7 @@ module EventsHelper
[event.action_name, target].join(" ")
end
- def event_filter_link key, tooltip
+ def event_filter_link(key, tooltip)
key = key.to_s
inactive = if @event_filter.active? key
nil
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 2031519c32fbbcd74b97d7017f52301b6efc2d71..7671033b539c90455d59a180ebaffb6ed490474c 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -1,5 +1,5 @@
module IssuesHelper
- def issue_css_classes issue
+ def issue_css_classes(issue)
classes = "issue"
classes << " closed" if issue.closed?
classes << " today" if issue.today?
@@ -84,7 +84,7 @@ module IssuesHelper
'id', 'name', object.assignee_id)
end
- def milestone_options object
+ def milestone_options(object)
options_from_collection_for_select(object.project.milestones.active,
'id', 'title', object.milestone_id)
end
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index cc63db2035eb8f6a4115658854b3a5b793017620..d1ea47eb7b37ff6df144003626b9bfe4336fb97a 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -24,14 +24,14 @@ module MergeRequestsHelper
}
end
- def mr_css_classes mr
+ def mr_css_classes(mr)
classes = "merge-request"
classes << " closed" if mr.closed?
classes << " merged" if mr.merged?
classes
end
- def ci_build_details_path merge_request
+ def ci_build_details_path(merge_request)
merge_request.source_project.ci_service.build_page(merge_request.last_commit.sha)
end
diff --git a/app/helpers/profile_helper.rb b/app/helpers/profile_helper.rb
index 297ae83d8955b4cc286ebf40cf54dfc533b984e8..0b3755583053c7b3c2aa780f36e9c7bebaaa5a70 100644
--- a/app/helpers/profile_helper.rb
+++ b/app/helpers/profile_helper.rb
@@ -1,5 +1,5 @@
module ProfileHelper
- def oauth_active_class provider
+ def oauth_active_class(provider)
if current_user.provider == provider.to_s
'active'
end
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index f7da30bcc4be0063f3aee1de3177f673f21849dc..6a16f112cb34de4f1f2e988cb93571375b7ca70a 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -3,7 +3,7 @@ module ProjectsHelper
"You are going to remove #{user.name} from #{project.name} project team. Are you sure?"
end
- def link_to_project project
+ def link_to_project(project)
link_to project do
title = content_tag(:span, project.name, class: 'project-name')
@@ -39,7 +39,7 @@ module ProjectsHelper
end
end
- def project_title project
+ def project_title(project)
if project.group
content_tag :span do
link_to(simple_sanitize(project.group.name), group_path(project.group)) + " / " + project.name
diff --git a/app/helpers/tab_helper.rb b/app/helpers/tab_helper.rb
index 610175f844791eead95398cc3d02966c0fab0ded..bc43e07856841d0d858b7ea0c1e5602585c409e1 100644
--- a/app/helpers/tab_helper.rb
+++ b/app/helpers/tab_helper.rb
@@ -89,7 +89,7 @@ module TabHelper
end
# Use nav_tab for save controller/action but different params
- def nav_tab key, value, &block
+ def nav_tab(key, value, &block)
o = {}
o[:class] = ""
diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb
index ebed6a837465bee1cb8354f995e88363b0c6a232..ef89bb32c6d4fb82418dbe853bcb736a20510e77 100644
--- a/app/helpers/tags_helper.rb
+++ b/app/helpers/tags_helper.rb
@@ -1,9 +1,9 @@
module TagsHelper
- def tag_path tag
+ def tag_path(tag)
"/tags/#{tag}"
end
- def tag_list project
+ def tag_list(project)
html = ''
project.tag_list.each do |tag|
html += link_to tag, tag_path(tag)
diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb
index d815257a4e3328e2590725663f49c38b54711f9d..ed3c401d8735bf9b5e748b7c96b26e9746ac5485 100644
--- a/app/helpers/tree_helper.rb
+++ b/app/helpers/tree_helper.rb
@@ -80,7 +80,7 @@ module TreeHelper
end
end
- def up_dir_path tree
+ def up_dir_path(tree)
file = File.join(@path, "..")
tree_join(@ref, file)
end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 716a23a4284189af00b6c636d4e32f12da548617..e155abc1449cf7a9d4996baeb066d8d32cd484b1 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -184,7 +184,7 @@ class Ability
]
end
- def group_abilities user, group
+ def group_abilities(user, group)
rules = []
if user.admin? || group.users.include?(user) || ProjectsFinder.new.execute(user, group: group).any?
@@ -209,7 +209,7 @@ class Ability
rules.flatten
end
- def namespace_abilities user, namespace
+ def namespace_abilities(user, namespace)
rules = []
# Only namespace owner and administrators can manage it
diff --git a/app/models/commit.rb b/app/models/commit.rb
index c8b2e0475ff424010a7b4fa1d5b80331a8e2402b..7f586ebe781fcf4a06d1bc59a4bdf691a491fef2 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -90,7 +90,7 @@ class Commit
# Discover issues should be closed when this commit is pushed to a project's
# default branch.
- def closes_issues project
+ def closes_issues(project)
Gitlab::ClosingIssueExtractor.closed_by_message_in_project(safe_message, project)
end
diff --git a/app/models/concerns/mentionable.rb b/app/models/concerns/mentionable.rb
index 81414959f3b31746212f60faa68985ffc25db1b0..71dd2f8c6973d9fea0bbe52a7f5e7fdd5fe393f4 100644
--- a/app/models/concerns/mentionable.rb
+++ b/app/models/concerns/mentionable.rb
@@ -10,7 +10,7 @@ module Mentionable
module ClassMethods
# Indicate which attributes of the Mentionable to search for GFM references.
- def attr_mentionable *attrs
+ def attr_mentionable(*attrs)
mentionable_attrs.concat(attrs.map(&:to_s))
end
@@ -38,7 +38,7 @@ module Mentionable
# Determine whether or not a cross-reference Note has already been created between this Mentionable and
# the specified target.
- def has_mentioned? target
+ def has_mentioned?(target)
Note.cross_reference_exists?(target, local_reference)
end
@@ -64,7 +64,7 @@ module Mentionable
end
# Extract GFM references to other Mentionables from this Mentionable. Always excludes its #local_reference.
- def references p = project, text = mentionable_text
+ def references(p = project, text = mentionable_text)
return [] if text.blank?
ext = Gitlab::ReferenceExtractor.new
ext.analyze(text)
@@ -72,7 +72,7 @@ module Mentionable
end
# Create a cross-reference Note for each GFM reference to another Mentionable found in +mentionable_text+.
- def create_cross_references! p = project, a = author, without = []
+ def create_cross_references!(p = project, a = author, without = [])
refs = references(p) - without
refs.each do |ref|
Note.create_cross_reference_note(ref, local_reference, a, p)
@@ -81,7 +81,7 @@ module Mentionable
# If the mentionable_text field is about to change, locate any *added* references and create cross references for
# them. Invoke from an observer's #before_save implementation.
- def notice_added_references p = project, a = author
+ def notice_added_references(p = project, a = author)
ch = changed_attributes
original, mentionable_changed = "", false
self.class.mentionable_attrs.each do |attr|
diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb
index f14900ad3e638364672e264c1ce43275eaeb34fe..71525f91961373f00f30122279fb37eddac56b65 100644
--- a/app/models/members/project_member.rb
+++ b/app/models/members/project_member.rb
@@ -77,7 +77,7 @@ class ProjectMember < Member
false
end
- def truncate_team project
+ def truncate_team(project)
truncate_teams [project.id]
end
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index b19b72906e7b0981b2326fec6b4f71dc923b66ae..c0c6de0ee7dcab9b90011a99cf4f70521d919e4c 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -38,7 +38,7 @@ class Namespace < ActiveRecord::Base
scope :root, -> { where('type IS NULL') }
- def self.search query
+ def self.search(query)
where("name LIKE :query OR path LIKE :query", query: "%#{query}%")
end
diff --git a/app/models/network/graph.rb b/app/models/network/graph.rb
index 9c95470beb1aee4b01c340446aa23f806d1a2ba9..43979b5e8071b619a2176abb0e7ced0d3ad74c4c 100644
--- a/app/models/network/graph.rb
+++ b/app/models/network/graph.rb
@@ -6,7 +6,7 @@ module Network
@max_count ||= 650
end
- def initialize project, ref, commit, filter_ref
+ def initialize(project, ref, commit, filter_ref)
@project = project
@ref = ref
@commit = commit
diff --git a/app/models/project.rb b/app/models/project.rb
index f9278f19dad605fc00f85336d05ad7d4b72a2ba7..0e940bca2c9fab7d62c4991fc53e46bb87ad8744 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -331,7 +331,7 @@ class Project < ActiveRecord::Base
path
end
- def items_for entity
+ def items_for(entity)
case entity
when 'issue' then
issues
@@ -504,7 +504,7 @@ class Project < ActiveRecord::Base
end
# Check if current branch name is marked as protected in the system
- def protected_branch? branch_name
+ def protected_branch?(branch_name)
protected_branches_names.include?(branch_name)
end
diff --git a/app/models/project_services/gitlab_ci_service.rb b/app/models/project_services/gitlab_ci_service.rb
index 4a19ca2f655187c3d481ac0b0cd7a36fe18af986..001b11c59668fea24ae4cbdfd6aede1a497c5d97 100644
--- a/app/models/project_services/gitlab_ci_service.rb
+++ b/app/models/project_services/gitlab_ci_service.rb
@@ -27,7 +27,7 @@ class GitlabCiService < CiService
hook.save
end
- def commit_status_path sha
+ def commit_status_path(sha)
project_url + "/builds/#{sha}/status.json?token=#{token}"
end
@@ -54,7 +54,7 @@ class GitlabCiService < CiService
end
end
- def build_page sha
+ def build_page(sha)
project_url + "/builds/#{sha}"
end
diff --git a/app/models/project_team.rb b/app/models/project_team.rb
index e2af10c6899817d8d0187777ae7e9eea4bdbbd46..e065554d3b86d64ad4c327bd9e5edf903a711af6 100644
--- a/app/models/project_team.rb
+++ b/app/models/project_team.rb
@@ -11,7 +11,7 @@ class ProjectTeam
# @team << [@user, :master]
# @team << [@users, :master]
#
- def << args
+ def <<(args)
users = args.first
if users.respond_to?(:each)
diff --git a/app/models/user.rb b/app/models/user.rb
index ed3eba4cdf0a22076e3a5bcb06f645d998222e3b..c90f24624266a897e5817e80360f849838d75b0a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -203,7 +203,7 @@ class User < ActiveRecord::Base
User.where(name: name).first
end
- def filter filter_name
+ def filter(filter_name)
case filter_name
when "admins"; self.admins
when "blocked"; self.blocked
@@ -213,7 +213,7 @@ class User < ActiveRecord::Base
end
end
- def search query
+ def search(query)
where("lower(name) LIKE :query OR lower(email) LIKE :query OR lower(username) LIKE :query", query: "%#{query.downcase}%")
end
@@ -332,7 +332,7 @@ class User < ActiveRecord::Base
several_namespaces? || admin
end
- def can? action, subject
+ def can?(action, subject)
abilities.allowed?(self, action, subject)
end
@@ -353,7 +353,7 @@ class User < ActiveRecord::Base
(personal_projects.count.to_f / projects_limit) * 100
end
- def recent_push project_id = nil
+ def recent_push(project_id = nil)
# Get push events not earlier than 2 hours ago
events = recent_events.code_push.where("created_at > ?", Time.now - 2.hours)
events = events.where(project_id: project_id) if project_id
@@ -382,11 +382,11 @@ class User < ActiveRecord::Base
project.team_member_by_id(self.id)
end
- def already_forked? project
+ def already_forked?(project)
!!fork_of(project)
end
- def fork_of project
+ def fork_of(project)
links = ForkedProjectLink.where(forked_from_project_id: project, forked_to_project_id: personal_projects)
if links.any?
@@ -512,7 +512,7 @@ class User < ActiveRecord::Base
NotificationService.new
end
- def log_info message
+ def log_info(message)
Gitlab::AppLogger.info message
end
diff --git a/app/services/base_service.rb b/app/services/base_service.rb
index 051612633cd298fe3f66385cbc0dcfcf1cd47ef5..ed286c0409585d2dd28ca317a71f008aec26583c 100644
--- a/app/services/base_service.rb
+++ b/app/services/base_service.rb
@@ -25,7 +25,7 @@ class BaseService
EventCreateService.new
end
- def log_info message
+ def log_info(message)
Gitlab::AppLogger.info message
end
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index 17c84c78d2d78ffed6af0f853ed7d59e615e7d57..1fe43f46c10e3b6e2e41b42d33212570438fd3e0 100644
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -75,7 +75,7 @@ class GitPushService
# Extract any GFM references from the pushed commit messages. If the configured issue-closing regex is matched,
# close the referenced Issue. Create cross-reference Notes corresponding to any other referenced Mentionables.
- def process_commit_messages ref
+ def process_commit_messages(ref)
is_default_branch = is_default_branch?(ref)
@push_commits.each do |commit|
@@ -165,34 +165,34 @@ class GitPushService
data
end
- def push_to_existing_branch? ref, oldrev
+ def push_to_existing_branch?(ref, oldrev)
ref_parts = ref.split('/')
# Return if this is not a push to a branch (e.g. new commits)
ref_parts[1] =~ /heads/ && oldrev != "0000000000000000000000000000000000000000"
end
- def push_to_new_branch? ref, oldrev
+ def push_to_new_branch?(ref, oldrev)
ref_parts = ref.split('/')
ref_parts[1] =~ /heads/ && oldrev == "0000000000000000000000000000000000000000"
end
- def push_remove_branch? ref, newrev
+ def push_remove_branch?(ref, newrev)
ref_parts = ref.split('/')
ref_parts[1] =~ /heads/ && newrev == "0000000000000000000000000000000000000000"
end
- def push_to_branch? ref
+ def push_to_branch?(ref)
ref =~ /refs\/heads/
end
- def is_default_branch? ref
+ def is_default_branch?(ref)
ref == "refs/heads/#{project.default_branch}"
end
- def commit_user commit
+ def commit_user(commit)
User.find_for_commit(commit.author_email, commit.author_name) || user
end
end
diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb
index 43ef54631a9ec75dc01a8373b71e10f113d68463..01586150cd2c2974b0db6a473a0f6c8276dc6be7 100644
--- a/app/workers/repository_import_worker.rb
+++ b/app/workers/repository_import_worker.rb
@@ -19,4 +19,4 @@ class RepositoryImportWorker
project.import_fail
end
end
-end
\ No newline at end of file
+end
diff --git a/features/steps/group.rb b/features/steps/group.rb
index da0cf7bbd45e1f35d6d868885b9813a2aaa13039..616a297db999ee99559980a5098193a4eededcc3 100644
--- a/features/steps/group.rb
+++ b/features/steps/group.rb
@@ -201,7 +201,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
protected
- def assigned_to_me key
+ def assigned_to_me(key)
project.send(key).where(assignee_id: current_user.id)
end
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 3a619169ecabf130a5513a5dacc19ccab79e8e5d..3262884f6d3a808986136b4247f7773bc68202db 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -71,7 +71,7 @@ module API
forbidden! unless current_user.is_admin?
end
- def authorize! action, subject
+ def authorize!(action, subject)
unless abilities.allowed?(current_user, action, subject)
forbidden!
end
diff --git a/lib/event_filter.rb b/lib/event_filter.rb
index 9b4b8c3801aca1894d545c4387eff18c6812c803..163937c02cfa75007e8e148ebec52c03915b21a3 100644
--- a/lib/event_filter.rb
+++ b/lib/event_filter.rb
@@ -23,7 +23,7 @@ class EventFilter
end
end
- def initialize params
+ def initialize(params)
@params = if params
params.dup
else
@@ -31,7 +31,7 @@ class EventFilter
end
end
- def apply_filter events
+ def apply_filter(events)
return events unless params.present?
filter = params.dup
@@ -50,7 +50,7 @@ class EventFilter
events = events.where(action: actions)
end
- def options key
+ def options(key)
filter = params.dup
if filter.include? key
@@ -62,7 +62,7 @@ class EventFilter
filter
end
- def active? key
+ def active?(key)
params.include? key
end
end
diff --git a/lib/gitlab/backend/shell.rb b/lib/gitlab/backend/shell.rb
index 907373ab991047554609445fc156c76808262a82..f95bbde5b399f315e14506dbb08fe4c219ff739c 100644
--- a/lib/gitlab/backend/shell.rb
+++ b/lib/gitlab/backend/shell.rb
@@ -213,7 +213,7 @@ module Gitlab
FileUtils.rm_r(satellites_path, force: true)
end
- def url_to_repo path
+ def url_to_repo(path)
Gitlab.config.gitlab_shell.ssh_path_prefix + "#{path}.git"
end
diff --git a/lib/gitlab/diff/parser.rb b/lib/gitlab/diff/parser.rb
index 9d6309954a4232fbc607d2cc5500e0baa0b79c54..f7c1f20d76295e3b2147f1a38203bd9e059f811f 100644
--- a/lib/gitlab/diff/parser.rb
+++ b/lib/gitlab/diff/parser.rb
@@ -72,7 +72,7 @@ module Gitlab
end
end
- def html_escape str
+ def html_escape(str)
replacements = { '&' => '&', '>' => '>', '<' => '<', '"' => '"', "'" => ''' }
str.gsub(/[&"'><]/, replacements)
end
diff --git a/lib/gitlab/inline_diff.rb b/lib/gitlab/inline_diff.rb
index 89c8e0680c30b1c70353290a323a30911e45c694..3517ecdf5cf003a710a160d42e82eba90eeb15f7 100644
--- a/lib/gitlab/inline_diff.rb
+++ b/lib/gitlab/inline_diff.rb
@@ -5,7 +5,7 @@ module Gitlab
START = "#!idiff-start!#"
FINISH = "#!idiff-finish!#"
- def processing diff_arr
+ def processing(diff_arr)
indexes = _indexes_of_changed_lines diff_arr
indexes.each do |index|
@@ -52,7 +52,7 @@ module Gitlab
diff_arr
end
- def _indexes_of_changed_lines diff_arr
+ def _indexes_of_changed_lines(diff_arr)
chain_of_first_symbols = ""
diff_arr.each_with_index do |line, i|
chain_of_first_symbols += line[0]
@@ -68,7 +68,7 @@ module Gitlab
indexes
end
- def replace_markers line
+ def replace_markers(line)
line.gsub!(START, "<span class='idiff'>")
line.gsub!(FINISH, "</span>")
line
diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb
index 64cf3303ea32b9085c40401360a55febd2071a2d..8a73ec5038adf0c0635baf7d4579859d57f5e385 100644
--- a/lib/gitlab/logger.rb
+++ b/lib/gitlab/logger.rb
@@ -15,7 +15,7 @@ module Gitlab
tail_output.split("\n")
end
- def self.read_latest_for filename
+ def self.read_latest_for(filename)
path = Rails.root.join("log", filename)
tail_output, _ = Gitlab::Popen.popen(%W(tail -n 2000 #{path}))
tail_output.split("\n")
diff --git a/lib/gitlab/reference_extractor.rb b/lib/gitlab/reference_extractor.rb
index 1eda614807f482717d60ff09036f1bab85a195f2..73b19ad55d58c597882ff12bf342737c2efe5511 100644
--- a/lib/gitlab/reference_extractor.rb
+++ b/lib/gitlab/reference_extractor.rb
@@ -9,38 +9,38 @@ module Gitlab
@users, @issues, @merge_requests, @snippets, @commits = [], [], [], [], []
end
- def analyze string
+ def analyze(string)
parse_references(string.dup)
end
# Given a valid project, resolve the extracted identifiers of the requested type to
# model objects.
- def users_for project
+ def users_for(project)
users.map do |identifier|
project.users.where(username: identifier).first
end.reject(&:nil?)
end
- def issues_for project
+ def issues_for(project)
issues.map do |identifier|
project.issues.where(iid: identifier).first
end.reject(&:nil?)
end
- def merge_requests_for project
+ def merge_requests_for(project)
merge_requests.map do |identifier|
project.merge_requests.where(iid: identifier).first
end.reject(&:nil?)
end
- def snippets_for project
+ def snippets_for(project)
snippets.map do |identifier|
project.snippets.where(id: identifier).first
end.reject(&:nil?)
end
- def commits_for project
+ def commits_for(project)
repo = project.repository
return [] if repo.nil?
diff --git a/lib/gitlab/satellite/satellite.rb b/lib/gitlab/satellite/satellite.rb
index f34d661c9fccc3fefde04933b79d7e6bb1e7b009..1de84309d15e2386c31b4eeebf98359add9ff555 100644
--- a/lib/gitlab/satellite/satellite.rb
+++ b/lib/gitlab/satellite/satellite.rb
@@ -11,7 +11,7 @@ module Gitlab
@project = project
end
- def log message
+ def log(message)
Gitlab::Satellite::Logger.error(message)
end
diff --git a/spec/lib/gitlab/satellite/action_spec.rb b/spec/lib/gitlab/satellite/action_spec.rb
index 2af1e9e32f9e719c3a12e633d4a9495d9cca64d3..3eb1258d67ea61fd0872f2348c60cf51d3a27a4f 100644
--- a/spec/lib/gitlab/satellite/action_spec.rb
+++ b/spec/lib/gitlab/satellite/action_spec.rb
@@ -97,7 +97,7 @@ describe 'Gitlab::Satellite::Action' do
end
class FileLockStatusChecker < File
- def flocked? &block
+ def flocked?(&block)
status = flock LOCK_EX|LOCK_NB
case status
when false