Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

13 files changed, 19 insertions, 29 deletions

diff --git a/.rubocop_todo/style/bare_percent_literals.yml b/.rubocop_todo/style/bare_percent_literals.yml
index 104ead817d5..1a155e3cca0 100644
--- a/.rubocop_todo/style/bare_percent_literals.yml
+++ b/.rubocop_todo/style/bare_percent_literals.yml
@@ -1,16 +1,13 @@
 ---
 # Cop supports --auto-correct.
 Style/BarePercentLiterals:
-  # Offense count: 220
-  # Temporarily disabled due to too many offenses
-  Enabled: false
+  Details: grace period
   Exclude:
     - 'app/models/commit.rb'
     - 'app/models/concerns/storage/legacy_namespace.rb'
     - 'app/models/integrations/datadog.rb'
     - 'app/services/feature_flags/base_service.rb'
     - 'app/services/repositories/base_service.rb'
-    - 'app/services/repositories/destroy_service.rb'
     - 'ee/app/services/jira/jql_builder_service.rb'
     - 'ee/lib/ee/gitlab/checks/push_rules/file_size_check.rb'
     - 'ee/spec/features/projects/environments/environments_spec.rb'
@@ -41,17 +38,15 @@ Style/BarePercentLiterals:
     - 'qa/qa/ee/page/project/show.rb'
     - 'qa/qa/ee/page/project/snippet/index.rb'
     - 'qa/qa/ee/page/project/wiki/show.rb'
-    - 'qa/qa/page/component/design_management.rb'
     - 'qa/qa/page/component/select2.rb'
     - 'qa/qa/page/element.rb'
     - 'qa/qa/page/file/form.rb'
     - 'qa/qa/page/project/web_ide/edit.rb'
     - 'qa/qa/resource/events/project.rb'
-    - 'qa/qa/resource/members.rb'
+    - 'qa/qa/resource/personal_access_token_cache.rb'
     - 'qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb'
-    - 'qa/qa/specs/features/ee/browser_ui/1_manage/group/group_saml_enforced_sso_new_account_spec.rb'
+    - 'qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_with_image_pull_policy_spec.rb'
     - 'qa/qa/specs/features/ee/browser_ui/3_create/repository/push_rules_spec.rb'
-    - 'qa/qa/support/page/logging.rb'
     - 'qa/spec/runtime/feature_spec.rb'
     - 'scripts/regenerate-schema'
     - 'scripts/trigger-build.rb'
@@ -79,6 +74,7 @@ Style/BarePercentLiterals:
     - 'spec/lib/banzai/filter/references/label_reference_filter_spec.rb'
     - 'spec/lib/banzai/filter/references/milestone_reference_filter_spec.rb'
     - 'spec/lib/banzai/pipeline/full_pipeline_spec.rb'
+    - 'spec/lib/banzai/pipeline/incident_management/timeline_event_pipeline_spec.rb'
     - 'spec/lib/banzai/pipeline/plain_markdown_pipeline_spec.rb'
     - 'spec/lib/banzai/reference_parser/commit_parser_spec.rb'
     - 'spec/lib/banzai/reference_parser/issue_parser_spec.rb'
@@ -95,6 +91,7 @@ Style/BarePercentLiterals:
     - 'spec/mailers/emails/releases_spec.rb'
     - 'spec/mailers/emails/service_desk_spec.rb'
     - 'spec/models/deployment_spec.rb'
+    - 'spec/models/incident_management/timeline_event_spec.rb'
     - 'spec/models/integrations/drone_ci_spec.rb'
     - 'spec/models/integrations/teamcity_spec.rb'
     - 'spec/models/project_label_spec.rb'
@@ -102,6 +99,8 @@ Style/BarePercentLiterals:
     - 'spec/requests/api/ci/job_artifacts_spec.rb'
     - 'spec/requests/api/deployments_spec.rb'
     - 'spec/requests/api/graphql/mutations/snippets/destroy_spec.rb'
+    - 'spec/requests/api/graphql/project/incident_management/timeline_events_spec.rb'
+    - 'spec/requests/projects/packages/package_files_controller_spec.rb'
     - 'spec/rubocop/cop/gitlab/mark_used_feature_flags_spec.rb'
     - 'spec/services/prometheus/proxy_variable_substitution_service_spec.rb'
     - 'spec/support/banzai/reference_filter_shared_examples.rb'
diff --git a/.rubocop_todo/style/class_and_module_children.yml b/.rubocop_todo/style/class_and_module_children.yml
index e0747f232a1..2674902c7ee 100644
--- a/.rubocop_todo/style/class_and_module_children.yml
+++ b/.rubocop_todo/style/class_and_module_children.yml
@@ -384,9 +384,6 @@ Style/ClassAndModuleChildren:
     - 'ee/app/controllers/admin/push_rules_controller.rb'
     - 'ee/app/controllers/admin/subscriptions_controller.rb'
     - 'ee/app/controllers/admin/user_permission_exports_controller.rb'
-    - 'ee/app/controllers/concerns/registrations/apply_trial.rb'
-    - 'ee/app/controllers/concerns/registrations/create_group.rb'
-    - 'ee/app/controllers/concerns/registrations/create_project.rb'
     - 'ee/app/controllers/concerns/registrations/verification.rb'
     - 'ee/app/controllers/ee/profiles/accounts_controller.rb'
     - 'ee/app/controllers/ee/profiles/preferences_controller.rb'
diff --git a/.rubocop_todo/style/empty_else.yml b/.rubocop_todo/style/empty_else.yml
index f211d022dcd..07e42692f60 100644
--- a/.rubocop_todo/style/empty_else.yml
+++ b/.rubocop_todo/style/empty_else.yml
@@ -29,7 +29,7 @@ Style/EmptyElse:
     - 'config/initializers/doorkeeper_openid_connect.rb'
     - 'ee/app/controllers/admin/audit_logs_controller.rb'
     - 'ee/app/controllers/ee/groups_controller.rb'
-    - 'ee/app/helpers/ee/kerberos_spnego_helper.rb'
+    - 'ee/app/helpers/ee/kerberos_helper.rb'
     - 'ee/app/helpers/ee/trial_helper.rb'
     - 'ee/app/models/ee/audit_event.rb'
     - 'ee/app/services/ee/users/update_service.rb'
diff --git a/.rubocop_todo/style/float_division.yml b/.rubocop_todo/style/float_division.yml
new file mode 100644
index 00000000000..7fd0cda469d
--- /dev/null
+++ b/.rubocop_todo/style/float_division.yml
@@ -0,0 +1,7 @@
+---
+Style/FloatDivision:
+  Exclude:
+    - 'ee/app/models/geo_node_status.rb'
+    - 'ee/app/models/namespaces/storage/root_size.rb'
+    - 'qa/qa/support/formatters/allure_metadata_formatter.rb'
+    - 'qa/qa/tools/reliable_report.rb'
diff --git a/.rubocop_todo/style/format_string.yml b/.rubocop_todo/style/format_string.yml
index bb95d8f7fe9..66c368a7a52 100644
--- a/.rubocop_todo/style/format_string.yml
+++ b/.rubocop_todo/style/format_string.yml
@@ -65,6 +65,7 @@ Style/FormatString:
     - 'app/helpers/members_helper.rb'
     - 'app/helpers/merge_requests_helper.rb'
     - 'app/helpers/mirror_helper.rb'
+    - 'app/helpers/notify_helper.rb'
     - 'app/helpers/preferences_helper.rb'
     - 'app/helpers/profiles_helper.rb'
     - 'app/helpers/projects/project_members_helper.rb'
diff --git a/.rubocop_todo/style/hash_as_last_array_item.yml b/.rubocop_todo/style/hash_as_last_array_item.yml
index 384d2dc5fce..aa22e9ed82b 100644
--- a/.rubocop_todo/style/hash_as_last_array_item.yml
+++ b/.rubocop_todo/style/hash_as_last_array_item.yml
@@ -20,7 +20,6 @@ Style/HashAsLastArrayItem:
     - 'app/graphql/resolvers/concerns/issue_resolver_arguments.rb'
     - 'app/graphql/types/boards/board_issuable_input_base_type.rb'
     - 'app/graphql/types/boards/board_issue_input_base_type.rb'
-    - 'app/helpers/learn_gitlab_helper.rb'
     - 'app/helpers/namespaces_helper.rb'
     - 'app/models/customer_relations/contact.rb'
     - 'app/models/customer_relations/organization.rb'
diff --git a/.rubocop_todo/style/if_unless_modifier.yml b/.rubocop_todo/style/if_unless_modifier.yml
index a58f71aee8f..cc21860d462 100644
--- a/.rubocop_todo/style/if_unless_modifier.yml
+++ b/.rubocop_todo/style/if_unless_modifier.yml
@@ -652,6 +652,7 @@ Style/IfUnlessModifier:
     - 'ee/app/services/vulnerability_feedback/create_service.rb'
     - 'ee/app/services/vulnerability_feedback/destroy_service.rb'
     - 'ee/app/services/vulnerability_feedback_module/update_service.rb'
+    - 'ee/app/services/elastic/cluster_reindexing_service.rb'
     - 'ee/app/validators/host_validator.rb'
     - 'ee/app/validators/password/complexity_validator.rb'
     - 'ee/app/workers/app_sec/dast/profile_schedule_worker.rb'
diff --git a/.rubocop_todo/style/lambda.yml b/.rubocop_todo/style/lambda.yml
index 5b898417d96..f733af601ec 100644
--- a/.rubocop_todo/style/lambda.yml
+++ b/.rubocop_todo/style/lambda.yml
@@ -77,7 +77,7 @@ Style/Lambda:
     - 'app/models/note.rb'
     - 'app/models/note_diff_file.rb'
     - 'app/models/notification_setting.rb'
-    - 'app/models/onboarding_progress.rb'
+    - 'app/models/onboarding/progress.rb'
     - 'app/models/operations/feature_flags/user_list.rb'
     - 'app/models/packages/package.rb'
     - 'app/models/packages/package_file.rb'
@@ -217,7 +217,6 @@ Style/Lambda:
     - 'lib/gitlab/sidekiq_signals.rb'
     - 'lib/gitlab/utils/measuring.rb'
     - 'lib/gitlab/visibility_level.rb'
-    - 'qa/qa/fixtures/auto_devops_rack/config.ru'
     - 'rubocop/cop/rspec/modify_sidekiq_middleware.rb'
     - 'rubocop/cop/rspec/timecop_freeze.rb'
     - 'rubocop/cop/rspec/timecop_travel.rb'
diff --git a/.rubocop_todo/style/next.yml b/.rubocop_todo/style/next.yml
index 4106cba955f..9570bd7b036 100644
--- a/.rubocop_todo/style/next.yml
+++ b/.rubocop_todo/style/next.yml
@@ -3,17 +3,7 @@
 Style/Next:
   Exclude:
     - 'app/models/concerns/integrations/slack_mattermost_notifier.rb'
-    - 'app/models/preloaders/environments/deployment_preloader.rb'
-    - 'app/models/route.rb'
-    - 'app/services/authorized_project_update/find_records_due_for_refresh_service.rb'
     - 'app/validators/nested_attributes_duplicates_validator.rb'
-    - 'config/initializers/01_secret_token.rb'
-    - 'config/initializers/sidekiq_cluster.rb'
-    - 'ee/app/controllers/groups/analytics/cycle_analytics/value_streams_controller.rb'
-    - 'ee/app/services/app_sec/dast/profiles/create_associations_service.rb'
-    - 'ee/app/services/elastic/cluster_reindexing_service.rb'
-    - 'ee/app/services/gitlab_subscriptions/fetch_purchase_eligible_namespaces_service.rb'
-    - 'ee/app/services/security/auto_fix_service.rb'
     - 'ee/app/services/security/ingestion/tasks/update_vulnerability_uuids.rb'
     - 'ee/db/fixtures/development/20_vulnerabilities.rb'
     - 'ee/lib/ee/audit/protected_branches_changes_auditor.rb'
diff --git a/.rubocop_todo/style/percent_literal_delimiters.yml b/.rubocop_todo/style/percent_literal_delimiters.yml
index ae019079a8d..9989ae3f8b3 100644
--- a/.rubocop_todo/style/percent_literal_delimiters.yml
+++ b/.rubocop_todo/style/percent_literal_delimiters.yml
@@ -254,7 +254,6 @@ Style/PercentLiteralDelimiters:
     - 'ee/app/mailers/previews/license_mailer_preview.rb'
     - 'ee/app/models/app_sec/fuzzing/api/scan_profile.rb'
     - 'ee/app/models/app_sec/fuzzing/coverage/corpus.rb'
-    - 'ee/app/models/concerns/approvable.rb'
     - 'ee/app/models/concerns/ee/issue_available_features.rb'
     - 'ee/app/models/ee/audit_event.rb'
     - 'ee/app/models/ee/description_version.rb'
diff --git a/.rubocop_todo/style/redundant_self.yml b/.rubocop_todo/style/redundant_self.yml
index 65f2ea327d7..8c688dc89c1 100644
--- a/.rubocop_todo/style/redundant_self.yml
+++ b/.rubocop_todo/style/redundant_self.yml
@@ -47,7 +47,6 @@ Style/RedundantSelf:
     - 'app/models/commit_status.rb'
     - 'app/models/compare.rb'
     - 'app/models/concerns/after_commit_queue.rb'
-    - 'app/models/concerns/approvable_base.rb'
     - 'app/models/concerns/atomic_internal_id.rb'
     - 'app/models/concerns/avatarable.rb'
     - 'app/models/concerns/awardable.rb'
diff --git a/.rubocop_todo/style/string_concatenation.yml b/.rubocop_todo/style/string_concatenation.yml
index 2330683cc18..3dd708d2c49 100644
--- a/.rubocop_todo/style/string_concatenation.yml
+++ b/.rubocop_todo/style/string_concatenation.yml
@@ -74,7 +74,7 @@ Style/StringConcatenation:
     - 'ee/lib/elastic/latest/git_class_proxy.rb'
     - 'ee/lib/gitlab/elastic/search_results.rb'
     - 'ee/lib/gitlab/geo/git_ssh_proxy.rb'
-    - 'ee/lib/omni_auth/strategies/kerberos_spnego.rb'
+    - 'ee/lib/omni_auth/strategies/kerberos.rb'
     - 'ee/lib/tasks/gitlab/elastic.rake'
     - 'ee/lib/tasks/gitlab/license.rake'
     - 'ee/spec/controllers/trial_registrations_controller_spec.rb'
diff --git a/.rubocop_todo/style/symbol_proc.yml b/.rubocop_todo/style/symbol_proc.yml
index 75aab7c6116..bfb3867b127 100644
--- a/.rubocop_todo/style/symbol_proc.yml
+++ b/.rubocop_todo/style/symbol_proc.yml
@@ -239,7 +239,6 @@ Style/SymbolProc:
     - 'spec/graphql/mutations/releases/create_spec.rb'
     - 'spec/graphql/types/work_items/widget_type_enum_spec.rb'
     - 'spec/helpers/instance_configuration_helper_spec.rb'
-    - 'spec/helpers/learn_gitlab_helper_spec.rb'
     - 'spec/helpers/members_helper_spec.rb'
     - 'spec/lib/backup/gitaly_backup_spec.rb'
     - 'spec/lib/gitlab/database/dynamic_model_helpers_spec.rb'