Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

3 files changed, 2 insertions, 21 deletions

diff --git a/.rubocop_todo/lint/missing_cop_enable_directive.yml b/.rubocop_todo/lint/missing_cop_enable_directive.yml
index 589f98c9e02..4c1c8430204 100644
--- a/.rubocop_todo/lint/missing_cop_enable_directive.yml
+++ b/.rubocop_todo/lint/missing_cop_enable_directive.yml
@@ -156,7 +156,6 @@ Lint/MissingCopEnableDirective:
     - 'lib/gitlab/background_migration/migrate_approver_to_approval_rules_check_progress.rb'
     - 'lib/gitlab/background_migration/migrate_approver_to_approval_rules_in_batch.rb'
     - 'lib/gitlab/background_migration/migrate_job_artifact_registry_to_ssf.rb'
-    - 'lib/gitlab/background_migration/migrate_stage_status.rb'
     - 'lib/gitlab/background_migration/migrate_u2f_webauthn.rb'
     - 'lib/gitlab/background_migration/populate_latest_pipeline_ids.rb'
     - 'lib/gitlab/background_migration/populate_resolved_on_default_branch_column.rb'
@@ -182,7 +181,6 @@ Lint/MissingCopEnableDirective:
     - 'lib/gitlab/patch/action_cable_redis_listener.rb'
     - 'lib/gitlab/patch/prependable.rb'
     - 'lib/gitlab/project_search_results.rb'
-    - 'lib/gitlab/task_helpers.rb'
     - 'lib/gitlab/testing/request_blocker_middleware.rb'
     - 'lib/gitlab/testing/request_inspector_middleware.rb'
     - 'lib/gitlab/testing/robots_blocker_middleware.rb'
@@ -192,4 +190,4 @@ Lint/MissingCopEnableDirective:
     - 'spec/support/capybara.rb'
     - 'spec/support/cycle_analytics_helpers/test_generation.rb'
     - 'spec/support/google_api/cloud_platform_helpers.rb'
-    - 'tooling/danger/product_intelligence.rb'
+    - 'tooling/danger/product_intelligence.rb'
\ No newline at end of file
diff --git a/.rubocop_todo/lint/mixed_regexp_capture_types.yml b/.rubocop_todo/lint/mixed_regexp_capture_types.yml
index f9872fdbd7f..3dcb9427ef8 100644
--- a/.rubocop_todo/lint/mixed_regexp_capture_types.yml
+++ b/.rubocop_todo/lint/mixed_regexp_capture_types.yml
@@ -10,7 +10,6 @@ Lint/MixedRegexpCaptureTypes:
     - 'lib/gitlab/diff/suggestions_parser.rb'
     - 'lib/gitlab/github_import/representation/note.rb'
     - 'lib/gitlab/metrics/system.rb'
-    - 'lib/gitlab/request_profiler/profile.rb'
     - 'lib/gitlab/slash_commands/issue_move.rb'
     - 'lib/gitlab/slash_commands/issue_new.rb'
-    - 'lib/gitlab/slash_commands/run.rb'
+    - 'lib/gitlab/slash_commands/run.rb'
\ No newline at end of file
diff --git a/.rubocop_todo/lint/redundant_cop_disable_directive.yml b/.rubocop_todo/lint/redundant_cop_disable_directive.yml
index 83901a6843e..d058e23109b 100644
--- a/.rubocop_todo/lint/redundant_cop_disable_directive.yml
+++ b/.rubocop_todo/lint/redundant_cop_disable_directive.yml
@@ -6,22 +6,6 @@ Lint/RedundantCopDisableDirective:
   # REVEAL_RUBOCOP_TODO environment variable.
   Enabled: false
   Exclude:
-    - 'app/controllers/admin/dashboard_controller.rb'
-    - 'app/controllers/concerns/enforces_two_factor_authentication.rb'
-    - 'app/controllers/concerns/integrations/actions.rb'
-    - 'app/controllers/concerns/issues_calendar.rb'
-    - 'app/controllers/concerns/snippets_actions.rb'
-    - 'app/controllers/concerns/wiki_actions.rb'
-    - 'app/controllers/groups/autocomplete_sources_controller.rb'
-    - 'app/controllers/groups/labels_controller.rb'
-    - 'app/controllers/import/fogbugz_controller.rb'
-    - 'app/controllers/import/github_controller.rb'
-    - 'app/controllers/projects/issues_controller.rb'
-    - 'app/controllers/projects/jobs_controller.rb'
-    - 'app/controllers/projects/pipeline_schedules_controller.rb'
-    - 'app/controllers/projects/pipelines/tests_controller.rb'
-    - 'app/controllers/search_controller.rb'
-    - 'app/controllers/sessions_controller.rb'
     - 'app/finders/autocomplete/acts_as_taggable_on/tags_finder.rb'
     - 'app/finders/autocomplete/move_to_project_finder.rb'
     - 'app/finders/autocomplete/routes_finder.rb'