Merge branch 'commented-keyword' into 'master'

Fix Style/CommentedKeyword cop

See merge request gitlab-org/gitlab!41119

.rubocop_todo.yml

@@ -539,12 +539,6 @@ Style/AccessModifierDeclarations:
 Style/BarePercentLiterals:
   Enabled: false
 
-# Offense count: 5
-Style/CommentedKeyword:
-  Exclude:
-    - 'lib/tasks/gitlab/backup.rake'
-    - 'spec/tasks/gitlab/backup_rake_spec.rb'
-
 # Offense count: 5
 # Cop supports --auto-correct.
 Style/EachWithObject:

changelogs/unreleased/commented-keyword.yml

+---
+title: Fix Style/CommentedKeyword cop
+merge_request: 41119
+author: Rajendra Kadam
+type: fixed

lib/tasks/gitlab/backup.rake

@@ -278,5 +278,7 @@ namespace :gitlab do
         $stdout
       end
     end
-  end # namespace end: backup
-end # namespace end: gitlab
+  end
+  # namespace end: backup
+end
+# namespace end: gitlab

spec/tasks/gitlab/backup_rake_spec.rb

@@ -160,7 +160,8 @@ RSpec.describe 'gitlab:app namespace rake task', :delete do
         expect(raw_repo.empty?).to be(false)
       end
     end
-  end # backup_restore task
+  end
+  # backup_restore task
 
   describe 'backup' do
     before do
@@ -391,7 +392,8 @@ RSpec.describe 'gitlab:app namespace rake task', :delete do
         expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout
       end
     end
-  end # backup_create task
+  end
+  # backup_create task
 
   describe "Skipping items" do
     before do
@@ -486,4 +488,5 @@ RSpec.describe 'gitlab:app namespace rake task', :delete do
       expect(backup_tar).to match(/\d+_\d{4}_\d{2}_\d{2}_\d+\.\d+\.\d+.*_gitlab_backup.tar$/)
     end
   end
-end # gitlab:app namespace
+end
+# gitlab:app namespace