Merge branch 'pl-rubocop-todo-closing-heredoc-indent' into 'master'

Resolve auto-correctable rule todo Layout/ClosingHeredocIndentation

See merge request gitlab-org/gitlab!40125

.rubocop_todo.yml

@@ -18,19 +18,6 @@ Capybara/CurrentPathExpectation:
 Layout/ArgumentAlignment:
   Enabled: false
 
-# Offense count: 13
-# Cop supports --auto-correct.
-Layout/ClosingHeredocIndentation:
-  Exclude:
-    - 'app/graphql/mutations/merge_requests/set_wip.rb'
-    - 'ee/db/geo/migrate/20180322062741_migrate_ci_job_artifacts_to_separate_registry.rb'
-    - 'ee/lib/gitlab/geo/health_check.rb'
-    - 'spec/features/merge_request/user_sees_diff_spec.rb'
-    - 'spec/lib/gitlab/asciidoc_spec.rb'
-    - 'spec/lib/gitlab/checks/project_moved_spec.rb'
-    - 'spec/rubocop/cop/active_record_association_reload_spec.rb'
-    - 'spec/services/task_list_toggle_service_spec.rb'
-
 # Offense count: 13
 # Cop supports --auto-correct.
 Layout/ClosingParenthesisIndentation:

app/graphql/mutations/merge_requests/set_wip.rb

@@ -9,8 +9,8 @@ module Mutations
                GraphQL::BOOLEAN_TYPE,
                required: true,
                description: <<~DESC
-                            Whether or not to set the merge request as a WIP.
-                            DESC
+                 Whether or not to set the merge request as a WIP.
+               DESC
 
       def resolve(project_path:, iid:, wip: nil)
         merge_request = authorized_find!(project_path: project_path, iid: iid)

ee/db/geo/migrate/20180322062741_migrate_ci_job_artifacts_to_separate_registry.rb

@@ -38,7 +38,7 @@ class MigrateCiJobArtifactsToSeparateRegistry < ActiveRecord::Migration[4.2]
           $BODY$
           LANGUAGE 'plpgsql'
           VOLATILE;
-          EOF
+      EOF
 
       execute <<~EOF
           CREATE TRIGGER replicate_job_artifact_registry

ee/lib/gitlab/geo/health_check.rb

@@ -54,7 +54,7 @@ module Gitlab
               EXTRACT (EPOCH FROM now() - #{Gitlab::Database.pg_last_xact_replay_timestamp}())::INTEGER
             END
             AS replication_lag
-          SQL
+        SQL
       end
 
       def db_migrate_path

spec/features/merge_request/user_sees_diff_spec.rb

@@ -97,7 +97,7 @@ RSpec.describe 'Merge request > User sees diff', :js do
             let c = 3;
             let d = 3;
           }
-        CONTENT
+          CONTENT
 
         new_file_content =
           <<~CONTENT
@@ -107,7 +107,7 @@ RSpec.describe 'Merge request > User sees diff', :js do
             let c = 3;
             let x = 3;
           }
-        CONTENT
+          CONTENT
 
         file_name = 'xss_file.rs'
 

spec/lib/gitlab/asciidoc_spec.rb

@@ -404,7 +404,7 @@ module Gitlab
             ++++
 
             stem:[2+2] is 4
-            MD
+          MD
 
           expect(render(input, context)).to include('<pre data-math-style="display" class="code math js-render-math"><code>eta_x gamma</code></pre>')
           expect(render(input, context)).to include('<p><code data-math-style="inline" class="code math js-render-math">2+2</code> is 4</p>')

spec/lib/gitlab/checks/project_moved_spec.rb

@@ -57,12 +57,12 @@ RSpec.describe Gitlab::Checks::ProjectMoved, :clean_gitlab_redis_shared_state do
       shared_examples 'returns redirect message' do
         it do
           message = <<~MSG
-                    Project '#{redirect_path}' was moved to '#{project.full_path}'.
+            Project '#{redirect_path}' was moved to '#{project.full_path}'.
 
-                    Please update your Git remote:
+            Please update your Git remote:
 
-                      git remote set-url origin #{url_to_repo}
-                    MSG
+              git remote set-url origin #{url_to_repo}
+          MSG
 
           expect(subject.message).to eq(message)
         end

spec/rubocop/cop/active_record_association_reload_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe RuboCop::Cop::ActiveRecordAssociationReload, type: :rubocop do
         users = User.all
         users.reload
               ^^^^^^ Use reset instead of reload. For more details check the https://gitlab.com/gitlab-org/gitlab-foss/issues/60218.
-        PATTERN
+      PATTERN
     end
 
     it 'does not register an offense on reset usage' do

spec/services/task_list_toggle_service_spec.rb

@@ -119,7 +119,7 @@ RSpec.describe TaskListToggleService do
       <<-EOT.strip_heredoc
       > > * [ ] Task 1
       > * [x] Task 2
-    EOT
+      EOT
 
     markdown_html = parse_markdown(markdown)
     toggler = described_class.new(markdown, markdown_html,
@@ -140,7 +140,7 @@ RSpec.describe TaskListToggleService do
 
       * [ ] Task 1
       * [x] Task 2
-    EOT
+      EOT
 
     markdown_html = parse_markdown(markdown)
     toggler = described_class.new(markdown, markdown_html,
@@ -158,7 +158,7 @@ RSpec.describe TaskListToggleService do
         <<-EOT.strip_heredoc
       - - [ ] Task 1
         - [x] Task 2
-      EOT
+        EOT
 
       markdown_html = parse_markdown(markdown)
       toggler = described_class.new(markdown, markdown_html,
@@ -175,7 +175,7 @@ RSpec.describe TaskListToggleService do
         <<-EOT.strip_heredoc
       1. - [ ] Task 1
          - [x] Task 2
-      EOT
+        EOT
 
       markdown_html = parse_markdown(markdown)
       toggler = described_class.new(markdown, markdown_html,