Skip to content

Commit 56de781

Browse files
committed
Revert "Enable Style/DotPosition"
This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9. # Conflicts: # .rubocop.yml # .rubocop_todo.yml # lib/gitlab/ci/config/entry/global.rb # lib/gitlab/ci/config/entry/jobs.rb # spec/lib/gitlab/ci/config/entry/factory_spec.rb # spec/lib/gitlab/ci/config/entry/global_spec.rb # spec/lib/gitlab/ci/config/entry/job_spec.rb # spec/lib/gitlab/ci/status/build/factory_spec.rb # spec/lib/gitlab/incoming_email_spec.rb
1 parent 1fe7501 commit 56de781

File tree

191 files changed

+886
-884
lines changed

Some content is hidden

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

191 files changed

+886
-884
lines changed

.rubocop.yml

-5
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,6 @@ Style/DefWithParentheses:
163163
Style/Documentation:
164164
Enabled: false
165165

166-
# This cop checks the . position in multi-line method calls.
167-
Style/DotPosition:
168-
Enabled: true
169-
EnforcedStyle: trailing
170-
171166
# This cop checks for uses of double negation (!!) to convert something
172167
# to a boolean value. As this is both cryptic and usually redundant, it
173168
# should be avoided.

.rubocop_todo.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,21 @@ Rails/SkipsModelValidations:
6363
# Cop supports --auto-correct.
6464
Security/YAMLLoad:
6565
Enabled: false
66-
66+
6767
# Offense count: 55
6868
# Cop supports --auto-correct.
6969
# Configuration parameters: EnforcedStyle, SupportedStyles.
7070
# SupportedStyles: percent_q, bare_percent
7171
Style/BarePercentLiterals:
7272
Enabled: false
7373

74+
# Offense count: 1304
75+
# Cop supports --auto-correct.
76+
# Configuration parameters: EnforcedStyle, SupportedStyles.
77+
# SupportedStyles: leading, trailing
78+
Style/DotPosition:
79+
Enabled: false
80+
7481
# Offense count: 6
7582
# Cop supports --auto-correct.
7683
Style/EachWithObject:

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?
@@ -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

app/controllers/projects/pipelines_controller.rb

+12-12
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ 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

1616
@running_count = PipelinesFinder.
1717
.new(project).execute(scope: 'running').count
@@ -29,10 +29,10 @@ def index
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
@@ -65,9 +65,9 @@ def create_from(build)
6565
end
6666

6767
def retry(build, current_user)
68-
Ci::RetryBuildService.
69-
new(build.project, current_user).
70-
execute(build)
68+
Ci::RetryBuildService
69+
.new(build.project, current_user)
70+
.execute(build)
7171
end
7272
end
7373

@@ -98,9 +98,9 @@ def retry(build, current_user)
9898
end
9999

100100
def detailed_status(current_user)
101-
Gitlab::Ci::Status::Build::Factory.
102-
new(self, current_user).
103-
fabricate!
101+
Gitlab::Ci::Status::Build::Factory
102+
.new(self, current_user)
103+
.fabricate!
104104
end
105105

106106
def manual?
@@ -222,9 +222,9 @@ def variables
222222
end
223223

224224
def merge_request
225-
merge_requests = MergeRequest.includes(:merge_request_diff).
226-
where(source_branch: ref, source_project_id: pipeline.gl_project_id).
227-
reorder(iid: :asc)
225+
merge_requests = MergeRequest.includes(:merge_request_diff)
226+
.where(source_branch: ref, source_project_id: pipeline.gl_project_id)
227+
.reorder(iid: :asc)
228228

229229
merge_requests.find do |merge_request|
230230
merge_request.commits_sha.include?(pipeline.sha)

0 commit comments

Comments
 (0)