Skip to content

Commit 3dadf30

Browse files
committed
Enable Style/DotPosition
1 parent 547063b commit 3dadf30

File tree

188 files changed

+868
-871
lines changed

Some content is hidden

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

188 files changed

+868
-871
lines changed

.rubocop.yml

+4
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@ Style/DefWithParentheses:
136136
Style/Documentation:
137137
Enabled: false
138138

139+
Style/DotPosition:
140+
Enabled: true
141+
EnforcedStyle: trailing
142+
139143
# Align elses and elsifs correctly.
140144
Style/ElseAlignment:
141145
Enabled: true

.rubocop_todo.yml

-7
Original file line numberDiff line numberDiff line change
@@ -305,13 +305,6 @@ Style/CommentAnnotation:
305305
Style/ConditionalAssignment:
306306
Enabled: false
307307

308-
# Offense count: 1304
309-
# Cop supports --auto-correct.
310-
# Configuration parameters: EnforcedStyle, SupportedStyles.
311-
# SupportedStyles: leading, trailing
312-
Style/DotPosition:
313-
Enabled: false
314-
315308
# Offense count: 21
316309
Style/DoubleNegation:
317310
Exclude:

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/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/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/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/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/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/compare_controller.rb

+2-2
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

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/merge_requests_controller.rb

+14-14
Original file line numberDiff line numberDiff line change
@@ -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?
@@ -639,8 +639,8 @@ def invalid_mr
639639
end
640640

641641
def merge_request_params
642-
params.require(:merge_request)
643-
.permit(merge_request_params_ce)
642+
params.require(:merge_request).
643+
permit(merge_request_params_ce)
644644
end
645645

646646
def merge_request_params_ce

app/controllers/projects/pipelines_controller.rb

+16-16
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,32 @@ class Projects::PipelinesController < Projects::ApplicationController
77

88
def index
99
@scope = params[:scope]
10-
@pipelines = PipelinesFinder
11-
.new(project)
12-
.execute(scope: @scope)
13-
.page(params[:page])
14-
.per(30)
10+
@pipelines = PipelinesFinder.
11+
new(project).
12+
execute(scope: @scope).
13+
page(params[:page]).
14+
per(30)
1515

16-
@running_count = PipelinesFinder
16+
@running_count = PipelinesFinder.
1717
.new(project).execute(scope: 'running').count
1818

19-
@pending_count = PipelinesFinder
19+
@pending_count = PipelinesFinder.
2020
.new(project).execute(scope: 'pending').count
2121

22-
@finished_count = PipelinesFinder
22+
@finished_count = PipelinesFinder.
2323
.new(project).execute(scope: 'finished').count
2424

25-
@pipelines_count = PipelinesFinder
25+
@pipelines_count = PipelinesFinder.
2626
.new(project).execute.count
2727

2828
respond_to do |format|
2929
format.html
3030
format.json do
3131
render json: {
32-
pipelines: PipelineSerializer
33-
.new(project: @project, user: @current_user)
34-
.with_pagination(request, response)
35-
.represent(@pipelines),
32+
pipelines: PipelineSerializer.
33+
new(project: @project, user: @current_user).
34+
with_pagination(request, response).
35+
represent(@pipelines),
3636
count: {
3737
all: @pipelines_count,
3838
running: @running_count,
@@ -49,9 +49,9 @@ def new
4949
end
5050

5151
def create
52-
@pipeline = Ci::CreatePipelineService
53-
.new(project, current_user, create_params)
54-
.execute(ignore_skip_ci: true, save_on_errors: false)
52+
@pipeline = Ci::CreatePipelineService.
53+
new(project, current_user, create_params).
54+
execute(ignore_skip_ci: true, save_on_errors: false)
5555
unless @pipeline.persisted?
5656
render 'new'
5757
return

app/controllers/projects_controller.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,8 @@ def load_events
293293
end
294294

295295
def project_params
296-
params.require(:project)
297-
.permit(project_params_ce)
296+
params.require(:project).
297+
permit(project_params_ce)
298298
end
299299

300300
def project_params_ce

app/controllers/users_controller.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ def load_events
118118

119119
def load_projects
120120
@projects =
121-
PersonalProjectsFinder.new(user).execute(current_user)
122-
.page(params[:page])
121+
PersonalProjectsFinder.new(user).execute(current_user).
122+
page(params[:page])
123123
end
124124

125125
def load_contributed_projects

app/finders/environments_finder.rb

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ def execute
1717
deployments.none
1818
end
1919

20-
environment_ids = deployments
21-
.group(:environment_id)
22-
.select(:environment_id)
20+
environment_ids = deployments.
21+
group(:environment_id).
22+
select(:environment_id)
2323

24-
environments = project.environments.available
25-
.where(id: environment_ids).order_by_last_deployed_at.to_a
24+
environments = project.environments.available.
25+
where(id: environment_ids).order_by_last_deployed_at.to_a
2626

2727
environments.select! do |environment|
2828
Ability.allowed?(current_user, :read_environment, environment)

app/models/ci/build.rb

+9-9
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ def create_from(build)
6363
end
6464

6565
def retry(build, current_user)
66-
Ci::RetryBuildService
67-
.new(build.project, current_user)
68-
.execute(build)
66+
Ci::RetryBuildService.
67+
new(build.project, current_user).
68+
execute(build)
6969
end
7070
end
7171

@@ -96,9 +96,9 @@ def retry(build, current_user)
9696
end
9797

9898
def detailed_status(current_user)
99-
Gitlab::Ci::Status::Build::Factory
100-
.new(self, current_user)
101-
.fabricate!
99+
Gitlab::Ci::Status::Build::Factory.
100+
new(self, current_user).
101+
fabricate!
102102
end
103103

104104
def manual?
@@ -220,9 +220,9 @@ def variables
220220
end
221221

222222
def merge_request
223-
merge_requests = MergeRequest.includes(:merge_request_diff)
224-
.where(source_branch: ref, source_project_id: pipeline.gl_project_id)
225-
.reorder(iid: :asc)
223+
merge_requests = MergeRequest.includes(:merge_request_diff).
224+
where(source_branch: ref, source_project_id: pipeline.gl_project_id).
225+
reorder(iid: :asc)
226226

227227
merge_requests.find do |merge_request|
228228
merge_request.commits_sha.include?(pipeline.sha)

0 commit comments

Comments
 (0)