Skip to content

Commit 206953a

Browse files
committed
Prefer leading style for Style/DotPosition
1 parent f72a656 commit 206953a

File tree

466 files changed

+3215
-3215
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

466 files changed

+3215
-3215
lines changed

.rubocop.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ Style/Documentation:
138138

139139
Style/DotPosition:
140140
Enabled: true
141-
EnforcedStyle: trailing
141+
EnforcedStyle: leading
142142

143143
# Align elses and elsifs correctly.
144144
Style/ElseAlignment:

app/controllers/admin/application_settings_controller.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ def show
55
end
66

77
def update
8-
successful = ApplicationSettings::UpdateService.
9-
new(@application_setting, current_user, application_setting_params).
10-
execute
8+
successful = ApplicationSettings::UpdateService
9+
.new(@application_setting, current_user, application_setting_params)
10+
.execute
1111

1212
if successful
1313
redirect_to admin_application_settings_path,

app/controllers/concerns/creates_commit.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ def existing_merge_request_path
8383
def merge_request_exists?
8484
return @merge_request if defined?(@merge_request)
8585

86-
@merge_request = MergeRequestsFinder.new(current_user, project_id: @mr_target_project.id).execute.opened.
87-
find_by(source_branch: @mr_source_branch, target_branch: @mr_target_branch, source_project_id: @mr_source_project)
86+
@merge_request = MergeRequestsFinder.new(current_user, project_id: @mr_target_project.id).execute.opened
87+
.find_by(source_branch: @mr_source_branch, target_branch: @mr_target_branch, source_project_id: @mr_source_project)
8888
end
8989

9090
def different_project?

app/controllers/concerns/issues_action.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ module IssuesAction
55
def issues
66
@label = issues_finder.labels.first
77

8-
@issues = issues_collection.
9-
non_archived.
10-
page(params[:page])
8+
@issues = issues_collection
9+
.non_archived
10+
.page(params[:page])
1111

1212
@collection_type = "Issue"
1313
@issuable_meta_data = issuable_meta_data(@issues, @collection_type)

app/controllers/concerns/membership_actions.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ def approve_access_request
1515
end
1616

1717
def leave
18-
member = Members::DestroyService.new(membershipable, current_user, user_id: current_user.id).
19-
execute(:all)
18+
member = Members::DestroyService.new(membershipable, current_user, user_id: current_user.id)
19+
.execute(:all)
2020

2121
source_type = membershipable.class.to_s.humanize(capitalize: false)
2222
notice =

app/controllers/concerns/merge_requests_action.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ module MergeRequestsAction
55
def merge_requests
66
@label = merge_requests_finder.labels.first
77

8-
@merge_requests = merge_requests_collection.
9-
page(params[:page])
8+
@merge_requests = merge_requests_collection
9+
.page(params[:page])
1010

1111
@collection_type = "MergeRequest"
1212
@issuable_meta_data = issuable_meta_data(@merge_requests, @collection_type)

app/controllers/import/bitbucket_controller.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ def status
2929
end
3030

3131
def jobs
32-
render json: current_user.created_projects.
33-
where(import_type: 'bitbucket').
34-
to_json(only: [:id, :import_status])
32+
render json: current_user.created_projects
33+
.where(import_type: 'bitbucket')
34+
.to_json(only: [:id, :import_status])
3535
end
3636

3737
def create

app/controllers/jwt_controller.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ def auth
1111
service = SERVICES[params[:service]]
1212
return head :not_found unless service
1313

14-
result = service.new(@authentication_result.project, @authentication_result.actor, auth_params).
15-
execute(authentication_abilities: @authentication_result.authentication_abilities)
14+
result = service.new(@authentication_result.project, @authentication_result.actor, auth_params)
15+
.execute(authentication_abilities: @authentication_result.authentication_abilities)
1616

1717
render json: result, status: result[:http_status]
1818
end

app/controllers/omniauth_callbacks_controller.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def oauth
144144
end
145145

146146
def log_audit_event(user, options = {})
147-
AuditEventService.new(user, user, options).
148-
for_authentication.security_event
147+
AuditEventService.new(user, user, options)
148+
.for_authentication.security_event
149149
end
150150
end

app/controllers/profiles_controller.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ def reset_incoming_email_token
4141
end
4242

4343
def audit_log
44-
@events = AuditEvent.where(entity_type: "User", entity_id: current_user.id).
45-
order("created_at DESC").
46-
page(params[:page])
44+
@events = AuditEvent.where(entity_type: "User", entity_id: current_user.id)
45+
.order("created_at DESC")
46+
.page(params[:page])
4747
end
4848

4949
def update_username

app/controllers/projects/badges_controller.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ class Projects::BadgesController < Projects::ApplicationController
44
before_action :no_cache_headers, except: [:index]
55

66
def build
7-
build_status = Gitlab::Badge::Build::Status.
8-
new(project, params[:ref])
7+
build_status = Gitlab::Badge::Build::Status
8+
.new(project, params[:ref])
99

1010
render_badge build_status
1111
end
1212

1313
def coverage
14-
coverage_report = Gitlab::Badge::Coverage::Report.
15-
new(project, params[:ref], params[:job])
14+
coverage_report = Gitlab::Badge::Coverage::Report
15+
.new(project, params[:ref], params[:job])
1616

1717
render_badge coverage_report
1818
end

app/controllers/projects/blob_controller.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ def validate_diff_params
164164
end
165165

166166
def set_last_commit_sha
167-
@last_commit_sha = Gitlab::Git::Commit.
168-
last_for_path(@repository, @ref, @path).sha
167+
@last_commit_sha = Gitlab::Git::Commit
168+
.last_for_path(@repository, @ref, @path).sha
169169
end
170170
end

app/controllers/projects/boards/issues_controller.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ def update
4040

4141
def issue
4242
@issue ||=
43-
IssuesFinder.new(current_user, project_id: project.id).
44-
execute.
45-
where(iid: params[:id]).
46-
first!
43+
IssuesFinder.new(current_user, project_id: project.id)
44+
.execute
45+
.where(iid: params[:id])
46+
.first!
4747
end
4848

4949
def authorize_read_issue!

app/controllers/projects/branches_controller.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ def create
3232
branch_name = sanitize(strip_tags(params[:branch_name]))
3333
branch_name = Addressable::URI.unescape(branch_name)
3434

35-
result = CreateBranchService.new(project, current_user).
36-
execute(branch_name, ref)
35+
result = CreateBranchService.new(project, current_user)
36+
.execute(branch_name, ref)
3737

3838
if params[:issue_iid]
3939
issue = IssuesFinder.new(current_user, project_id: @project.id).find_by(iid: params[:issue_iid])

app/controllers/projects/builds_controller.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ def trace
4848
respond_to do |format|
4949
format.json do
5050
state = params[:state].presence
51-
render json: @build.trace_with_state(state: state).
52-
merge!(id: @build.id, status: @build.status)
51+
render json: @build.trace_with_state(state: state)
52+
.merge!(id: @build.id, status: @build.status)
5353
end
5454
end
5555
end

app/controllers/projects/commit_controller.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ def pipelines
3535
respond_to do |format|
3636
format.html
3737
format.json do
38-
render json: PipelineSerializer.
39-
new(project: @project, user: @current_user).
40-
represent(@pipelines)
38+
render json: PipelineSerializer
39+
.new(project: @project, user: @current_user)
40+
.represent(@pipelines)
4141
end
4242
end
4343
end

app/controllers/projects/commits_controller.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ def show
1818
@repository.commits(@ref, path: @path, limit: @limit, offset: @offset)
1919
end
2020

21-
@note_counts = project.notes.where(commit_id: @commits.map(&:id)).
22-
group(:commit_id).count
21+
@note_counts = project.notes.where(commit_id: @commits.map(&:id))
22+
.group(:commit_id).count
2323

24-
@merge_request = MergeRequestsFinder.new(current_user, project_id: @project.id).execute.opened.
25-
find_by(source_project: @project, source_branch: @ref, target_branch: @repository.root_ref)
24+
@merge_request = MergeRequestsFinder.new(current_user, project_id: @project.id).execute.opened
25+
.find_by(source_project: @project, source_branch: @ref, target_branch: @repository.root_ref)
2626

2727
respond_to do |format|
2828
format.html

app/controllers/projects/compare_controller.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ def define_ref_vars
4646
end
4747

4848
def define_diff_vars
49-
@compare = CompareService.new(@project, @head_ref).
50-
execute(@project, @start_ref)
49+
@compare = CompareService.new(@project, @head_ref)
50+
.execute(@project, @start_ref)
5151

5252
if @compare
5353
@commits = @compare.commits
@@ -66,7 +66,7 @@ def define_diff_vars
6666
end
6767

6868
def merge_request
69-
@merge_request ||= MergeRequestsFinder.new(current_user, project_id: @project.id).execute.opened.
70-
find_by(source_project: @project, source_branch: @head_ref, target_branch: @start_ref)
69+
@merge_request ||= MergeRequestsFinder.new(current_user, project_id: @project.id).execute.opened
70+
.find_by(source_project: @project, source_branch: @head_ref, target_branch: @start_ref)
7171
end
7272
end

app/controllers/projects/environments_controller.rb

+11-11
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ class Projects::EnvironmentsController < Projects::ApplicationController
99
before_action :verify_api_request!, only: :terminal_websocket_authorize
1010

1111
def index
12-
@environments = project.environments.
13-
with_state(params[:scope] || :available)
12+
@environments = project.environments
13+
.with_state(params[:scope] || :available)
1414

1515
respond_to do |format|
1616
format.html
1717
format.json do
1818
render json: {
19-
environments: EnvironmentSerializer.
20-
new(project: @project, user: @current_user).
21-
with_pagination(request, response).
22-
within_folders.
23-
represent(@environments),
19+
environments: EnvironmentSerializer
20+
.new(project: @project, user: @current_user)
21+
.with_pagination(request, response)
22+
.within_folders
23+
.represent(@environments),
2424
available_count: project.environments.available.count,
2525
stopped_count: project.environments.stopped.count
2626
}
@@ -36,10 +36,10 @@ def folder
3636
format.html
3737
format.json do
3838
render json: {
39-
environments: EnvironmentSerializer.
40-
new(project: @project, user: @current_user).
41-
with_pagination(request, response).
42-
represent(@environments),
39+
environments: EnvironmentSerializer
40+
.new(project: @project, user: @current_user)
41+
.with_pagination(request, response)
42+
.represent(@environments),
4343
available_count: folder_environments.available.count,
4444
stopped_count: folder_environments.stopped.count
4545
}

app/controllers/projects/issues_controller.rb

+5-5
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ def edit
7777
def show
7878
raw_notes = @issue.notes.inc_relations_for_view.fresh
7979

80-
@notes = Banzai::NoteRenderer.
81-
render(raw_notes, @project, current_user, @path, @project_wiki, @ref)
80+
@notes = Banzai::NoteRenderer
81+
.render(raw_notes, @project, current_user, @path, @project_wiki, @ref)
8282

8383
@note = @project.notes.new(noteable: @issue)
8484
@noteable = @issue
@@ -189,9 +189,9 @@ def issue
189189
def merge_request_for_resolving_discussions
190190
return unless merge_request_iid = params[:merge_request_for_resolving_discussions]
191191

192-
@merge_request_for_resolving_discussions ||= MergeRequestsFinder.new(current_user, project_id: project.id).
193-
execute.
194-
find_by(iid: merge_request_iid)
192+
@merge_request_for_resolving_discussions ||= MergeRequestsFinder.new(current_user, project_id: project.id)
193+
.execute
194+
.find_by(iid: merge_request_iid)
195195
end
196196

197197
def authorize_read_issue!

app/controllers/projects/merge_requests_controller.rb

+18-18
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ def commits
162162
# Get commits from repository
163163
# or from cache if already merged
164164
@commits = @merge_request.commits
165-
@note_counts = Note.where(commit_id: @commits.map(&:id)).
166-
group(:commit_id).count
165+
@note_counts = Note.where(commit_id: @commits.map(&:id))
166+
.group(:commit_id).count
167167

168168
render json: { html: view_to_html_string('projects/merge_requests/show/_commits') }
169169
end
@@ -232,9 +232,9 @@ def pipelines
232232
end
233233

234234
format.json do
235-
render json: PipelineSerializer.
236-
new(project: @project, user: @current_user).
237-
represent(@pipelines)
235+
render json: PipelineSerializer
236+
.new(project: @project, user: @current_user)
237+
.represent(@pipelines)
238238
end
239239
end
240240
end
@@ -245,9 +245,9 @@ def new
245245
format.json do
246246
define_pipelines_vars
247247

248-
render json: PipelineSerializer.
249-
new(project: @project, user: @current_user).
250-
represent(@pipelines)
248+
render json: PipelineSerializer
249+
.new(project: @project, user: @current_user)
250+
.represent(@pipelines)
251251
end
252252
end
253253
end
@@ -332,9 +332,9 @@ def cancel_merge_when_build_succeeds
332332
return access_denied!
333333
end
334334

335-
MergeRequests::MergeWhenPipelineSucceedsService.
336-
new(@project, current_user).
337-
cancel(@merge_request)
335+
MergeRequests::MergeWhenPipelineSucceedsService
336+
.new(@project, current_user)
337+
.cancel(@merge_request)
338338
end
339339

340340
def merge
@@ -361,9 +361,9 @@ def merge
361361
end
362362

363363
if @merge_request.head_pipeline.active?
364-
MergeRequests::MergeWhenPipelineSucceedsService.
365-
new(@project, current_user, merge_params).
366-
execute(@merge_request)
364+
MergeRequests::MergeWhenPipelineSucceedsService
365+
.new(@project, current_user, merge_params)
366+
.execute(@merge_request)
367367

368368
@status = :merge_when_build_succeeds
369369
elsif @merge_request.head_pipeline.success?
@@ -624,8 +624,8 @@ def define_new_vars
624624
@commit = @merge_request.diff_head_commit
625625
@base_commit = @merge_request.diff_base_commit
626626

627-
@note_counts = Note.where(commit_id: @commits.map(&:id)).
628-
group(:commit_id).count
627+
@note_counts = Note.where(commit_id: @commits.map(&:id))
628+
.group(:commit_id).count
629629

630630
@labels = LabelsFinder.new(current_user, project_id: @project.id).execute
631631

@@ -640,8 +640,8 @@ def invalid_mr
640640
end
641641

642642
def merge_request_params
643-
params.require(:merge_request).
644-
permit(merge_request_params_ce)
643+
params.require(:merge_request)
644+
.permit(merge_request_params_ce)
645645
end
646646

647647
def merge_request_params_ce

0 commit comments

Comments
 (0)