Add latest changes from gitlab-org/gitlab@master

8 files changed, 2 insertions, 8 deletions

diff --git a/.rubocop_todo/gitlab/strong_memoize_attr.yml b/.rubocop_todo/gitlab/strong_memoize_attr.yml
index f05e7ba35af..21b8a2c9dec 100644
--- a/.rubocop_todo/gitlab/strong_memoize_attr.yml
+++ b/.rubocop_todo/gitlab/strong_memoize_attr.yml
@@ -317,7 +317,7 @@ Gitlab/StrongMemoizeAttr:
     - 'ee/app/helpers/ee/preferences_helper.rb'
     - 'ee/app/helpers/ee/registrations_helper.rb'
     - 'ee/app/helpers/ee/timeboxes_helper.rb'
-    - 'ee/app/helpers/ee/trial_helper.rb'
+    - 'ee/app/helpers/trials_helper.rb'
     - 'ee/app/helpers/ee/welcome_helper.rb'
     - 'ee/app/helpers/license_monitoring_helper.rb'
     - 'ee/app/helpers/subscriptions_helper.rb'
diff --git a/.rubocop_todo/layout/first_hash_element_indentation.yml b/.rubocop_todo/layout/first_hash_element_indentation.yml
index 8d9759d0c4a..fed5e185898 100644
--- a/.rubocop_todo/layout/first_hash_element_indentation.yml
+++ b/.rubocop_todo/layout/first_hash_element_indentation.yml
@@ -46,7 +46,6 @@ Layout/FirstHashElementIndentation:
     - 'ee/app/graphql/mutations/iterations/update.rb'
     - 'ee/app/helpers/ee/geo_helper.rb'
     - 'ee/app/helpers/ee/groups/group_members_helper.rb'
-    - 'ee/app/helpers/ee/trial_helper.rb'
     - 'ee/app/models/ee/list.rb'
     - 'ee/app/services/app_sec/dast/profiles/update_service.rb'
     - 'ee/app/services/elastic/cluster_reindexing_service.rb'
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index 9f11c94f242..376671613b9 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -1042,7 +1042,6 @@ Layout/LineLength:
     - 'ee/app/helpers/ee/projects_helper.rb'
     - 'ee/app/helpers/ee/search_helper.rb'
     - 'ee/app/helpers/ee/subscribable_banner_helper.rb'
-    - 'ee/app/helpers/ee/trial_helper.rb'
     - 'ee/app/helpers/epics_helper.rb'
     - 'ee/app/helpers/gitlab_subscriptions/upcoming_reconciliation_helper.rb'
     - 'ee/app/helpers/groups/security_features_helper.rb'
diff --git a/.rubocop_todo/rspec/factory_bot/avoid_create.yml b/.rubocop_todo/rspec/factory_bot/avoid_create.yml
index fe8a1cb6bfa..1c3654c670d 100644
--- a/.rubocop_todo/rspec/factory_bot/avoid_create.yml
+++ b/.rubocop_todo/rspec/factory_bot/avoid_create.yml
@@ -50,7 +50,7 @@ RSpec/FactoryBot/AvoidCreate:
     - 'ee/spec/helpers/ee/security_orchestration_helper_spec.rb'
     - 'ee/spec/helpers/ee/subscribable_banner_helper_spec.rb'
     - 'ee/spec/helpers/ee/todos_helper_spec.rb'
-    - 'ee/spec/helpers/ee/trial_helper_spec.rb'
+    - 'ee/spec/helpers/trials_helper_spec.rb'
     - 'ee/spec/helpers/ee/users/callouts_helper_spec.rb'
     - 'ee/spec/helpers/ee/welcome_helper_spec.rb'
     - 'ee/spec/helpers/ee/wiki_helper_spec.rb'
diff --git a/.rubocop_todo/rspec/missing_feature_category.yml b/.rubocop_todo/rspec/missing_feature_category.yml
index 6fa47e8788f..84ff2f52c7b 100644
--- a/.rubocop_todo/rspec/missing_feature_category.yml
+++ b/.rubocop_todo/rspec/missing_feature_category.yml
@@ -521,7 +521,6 @@ RSpec/MissingFeatureCategory:
     - 'ee/spec/helpers/ee/subscribable_banner_helper_spec.rb'
     - 'ee/spec/helpers/ee/system_note_helper_spec.rb'
     - 'ee/spec/helpers/ee/todos_helper_spec.rb'
-    - 'ee/spec/helpers/ee/trial_helper_spec.rb'
     - 'ee/spec/helpers/ee/trial_registration_helper_spec.rb'
     - 'ee/spec/helpers/ee/users/callouts_helper_spec.rb'
     - 'ee/spec/helpers/ee/version_check_helper_spec.rb'
diff --git a/.rubocop_todo/rspec/verified_doubles.yml b/.rubocop_todo/rspec/verified_doubles.yml
index 7bb6e4a8188..6c7653fe0c1 100644
--- a/.rubocop_todo/rspec/verified_doubles.yml
+++ b/.rubocop_todo/rspec/verified_doubles.yml
@@ -31,7 +31,6 @@ RSpec/VerifiedDoubles:
     - 'ee/spec/helpers/ee/ci/runners_helper_spec.rb'
     - 'ee/spec/helpers/ee/integrations_helper_spec.rb'
     - 'ee/spec/helpers/ee/subscribable_banner_helper_spec.rb'
-    - 'ee/spec/helpers/ee/trial_helper_spec.rb'
     - 'ee/spec/helpers/ee/trial_registration_helper_spec.rb'
     - 'ee/spec/helpers/kerberos_helper_spec.rb'
     - 'ee/spec/helpers/license_helper_spec.rb'
diff --git a/.rubocop_todo/style/empty_else.yml b/.rubocop_todo/style/empty_else.yml
index 97f974c9a19..87b170297a2 100644
--- a/.rubocop_todo/style/empty_else.yml
+++ b/.rubocop_todo/style/empty_else.yml
@@ -29,7 +29,6 @@ Style/EmptyElse:
     - 'ee/app/controllers/admin/audit_logs_controller.rb'
     - 'ee/app/controllers/ee/groups_controller.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'
     - 'ee/app/services/epics/tree_reorder_service.rb'
diff --git a/.rubocop_todo/style/percent_literal_delimiters.yml b/.rubocop_todo/style/percent_literal_delimiters.yml
index 7bf16fd05f7..31195e54f78 100644
--- a/.rubocop_todo/style/percent_literal_delimiters.yml
+++ b/.rubocop_todo/style/percent_literal_delimiters.yml
@@ -191,7 +191,6 @@ Style/PercentLiteralDelimiters:
     - 'ee/app/helpers/ee/issues_helper.rb'
     - 'ee/app/helpers/ee/labels_helper.rb'
     - 'ee/app/helpers/ee/nav_helper.rb'
-    - 'ee/app/helpers/ee/trial_helper.rb'
     - 'ee/app/mailers/previews/ci_minutes_usage_mailer_preview.rb'
     - 'ee/app/mailers/previews/emails/namespace_storage_usage_mailer_preview.rb'
     - 'ee/app/mailers/previews/license_mailer_preview.rb'