Merge branch 'closing-paren-cop' into 'master'

Fix Layout/ClosingParenthesisIndentation cop

See merge request gitlab-org/gitlab!41084

.rubocop_todo.yml

@@ -18,17 +18,6 @@ Capybara/CurrentPathExpectation:
 Layout/ArgumentAlignment:
   Enabled: false
 
-# Offense count: 13
-# Cop supports --auto-correct.
-Layout/ClosingParenthesisIndentation:
-  Exclude:
-    - 'db/post_migrate/20180704145007_update_project_indexes.rb'
-    - 'ee/db/geo/migrate/20180405074130_add_partial_index_project_repository_verification.rb'
-    - 'spec/services/issues/resolve_discussions_spec.rb'
-    - 'spec/services/projects/update_service_spec.rb'
-    - 'spec/support/helpers/stub_object_storage.rb'
-    - 'spec/workers/remove_unreferenced_lfs_objects_worker_spec.rb'
-
 # Offense count: 72
 # Cop supports --auto-correct.
 Layout/EmptyLinesAroundArguments:

changelogs/unreleased/closing-paren-cop.yml

+---
+title: Fix Layout/ClosingParenthesisIndentation cop
+merge_request: 41084
+author: Rajendra Kadam
+type: fixed

ee/db/geo/migrate/20180405074130_add_partial_index_project_repository_verification.rb

@@ -12,13 +12,13 @@ class AddPartialIndexProjectRepositoryVerification < ActiveRecord::Migration[4.2
       [:project_id],
       name: REPO_INDEX_NAME,
       where: 'repository_verification_checksum_sha IS NULL AND last_repository_verification_failure IS NULL'
-                        )
+    )
 
     add_concurrent_index(:project_registry,
     [:project_id],
       name: WIKI_INDEX_NAME,
       where: 'wiki_verification_checksum_sha IS NULL AND last_wiki_verification_failure IS NULL'
-                        )
+    )
   end
 
   def down

spec/services/issues/resolve_discussions_spec.rb

@@ -79,7 +79,7 @@ RSpec.describe Issues::ResolveDiscussions do
                                                    noteable: merge_request,
                                                    project: merge_request.target_project,
                                                    line_number: 15
-                                                   )])
+        )])
         service = DummyService.new(
           project,
           user,

spec/services/projects/update_service_spec.rb

@@ -272,7 +272,7 @@ RSpec.describe Projects::UpdateService do
 
         result = update_project(project, user, project_feature_attributes:
                                  { issues_access_level: ProjectFeature::PRIVATE }
-                               )
+        )
 
         expect(result).to eq({ status: :success })
         expect(project.project_feature.issues_access_level).to be(ProjectFeature::PRIVATE)
@@ -479,14 +479,14 @@ RSpec.describe Projects::UpdateService do
           attributes_for(:prometheus_service,
                          project: project,
                          properties: { api_url: "http://new.prometheus.com", manual_configuration: "0" }
-          )
+                        )
         end
 
         let!(:prometheus_service) do
           create(:prometheus_service,
                  project: project,
                  properties: { api_url: "http://old.prometheus.com", manual_configuration: "0" }
-          )
+                )
         end
 
         it 'updates existing record' do
@@ -503,7 +503,7 @@ RSpec.describe Projects::UpdateService do
             attributes_for(:prometheus_service,
                            project: project,
                            properties: { api_url: "http://example.prometheus.com", manual_configuration: "0" }
-            )
+                          )
           end
 
           it 'creates new record' do
@@ -519,7 +519,7 @@ RSpec.describe Projects::UpdateService do
             attributes_for(:prometheus_service,
                            project: project,
                            properties: { api_url: nil, manual_configuration: "1" }
-            )
+                          )
           end
 
           it 'does not create new record' do

spec/support/helpers/stub_object_storage.rb

@@ -21,7 +21,7 @@ module StubObjectStorage
         proxy_download: false,
         background_upload: false,
         direct_upload: false
-  )
+      )
     allow(config).to receive(:enabled) { enabled }
     allow(config).to receive(:proxy_download) { proxy_download }
     allow(config).to receive(:background_upload) { background_upload }

spec/workers/remove_unreferenced_lfs_objects_worker_spec.rb

@@ -16,21 +16,21 @@ RSpec.describe RemoveUnreferencedLfsObjectsWorker do
       create(:lfs_objects_project,
                 project: project1,
                 lfs_object: referenced_lfs_object1
-            )
+      )
     end
 
     let!(:lfs_objects_project2_1) do
       create(:lfs_objects_project,
                 project: project2,
                 lfs_object: referenced_lfs_object1
-            )
+      )
     end
 
     let!(:lfs_objects_project1_2) do
       create(:lfs_objects_project,
                 project: project1,
                 lfs_object: referenced_lfs_object2
-            )
+      )
     end
 
     it 'removes unreferenced lfs objects' do