Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-12-02 06:07:57 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-12-02 06:07:57 +0300
commit0409a31740fa29fa1131c0496da16677cb3debe4 (patch)
tree4cbcd702a01145e8acd723f21b6bd52f3c6639d0 /.rubocop_todo
parentb26eec8cbcf32085079eee0e196456eccefc993f (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.rubocop_todo')
-rw-r--r--.rubocop_todo/layout/first_hash_element_indentation.yml3
-rw-r--r--.rubocop_todo/rspec/factory_bot/avoid_create.yml4
-rw-r--r--.rubocop_todo/style/format_string.yml4
3 files changed, 6 insertions, 5 deletions
diff --git a/.rubocop_todo/layout/first_hash_element_indentation.yml b/.rubocop_todo/layout/first_hash_element_indentation.yml
index 02ed77083fa..34446f2cb61 100644
--- a/.rubocop_todo/layout/first_hash_element_indentation.yml
+++ b/.rubocop_todo/layout/first_hash_element_indentation.yml
@@ -77,7 +77,8 @@ Layout/FirstHashElementIndentation:
- 'app/services/timelogs/base_service.rb'
- 'app/validators/addressable_url_validator.rb'
- 'app/workers/concerns/cluster_cleanup_methods.rb'
- - 'ee/app/components/namespaces/free_user_cap/alert_component.rb'
+ - 'ee/app/components/namespaces/free_user_cap/enforcement_alert_component.rb'
+ - 'ee/app/components/namespaces/free_user_cap/notification_alert_component.rb'
- 'ee/app/controllers/groups/analytics/tasks_by_type_controller.rb'
- 'ee/app/graphql/mutations/boards/epic_lists/destroy.rb'
- 'ee/app/graphql/mutations/boards/epics/create.rb'
diff --git a/.rubocop_todo/rspec/factory_bot/avoid_create.yml b/.rubocop_todo/rspec/factory_bot/avoid_create.yml
index 9f9cb409b23..901641ed991 100644
--- a/.rubocop_todo/rspec/factory_bot/avoid_create.yml
+++ b/.rubocop_todo/rspec/factory_bot/avoid_create.yml
@@ -1,9 +1,9 @@
---
RSpec/FactoryBot/AvoidCreate:
Exclude:
- - 'ee/spec/components/namespaces/free_user_cap/alert_component_spec.rb'
+ - 'ee/spec/components/namespaces/free_user_cap/enforcement_alert_component_spec.rb'
- 'ee/spec/components/namespaces/free_user_cap/non_owner_alert_component_spec.rb'
- - 'ee/spec/components/namespaces/free_user_cap/preview_alert_component_spec.rb'
+ - 'ee/spec/components/namespaces/free_user_cap/notification_alert_component_spec.rb'
- 'ee/spec/components/namespaces/free_user_cap/usage_quota_alert_component_spec.rb'
- 'ee/spec/components/namespaces/free_user_cap/usage_quota_trial_alert_component_spec.rb'
- 'ee/spec/components/namespaces/storage/limit_alert_component_spec.rb'
diff --git a/.rubocop_todo/style/format_string.yml b/.rubocop_todo/style/format_string.yml
index 0e8abb1b12a..1e4356aed17 100644
--- a/.rubocop_todo/style/format_string.yml
+++ b/.rubocop_todo/style/format_string.yml
@@ -183,8 +183,8 @@ Style/FormatString:
- 'config/initializers/rack_lineprof.rb'
- 'danger/roulette/Dangerfile'
- 'ee/app/components/billing/plan_component.rb'
- - 'ee/app/components/namespaces/free_user_cap/alert_component.rb'
- - 'ee/app/components/namespaces/free_user_cap/preview_alert_component.rb'
+ - 'ee/app/components/namespaces/free_user_cap/enforcement_alert_component.rb'
+ - 'ee/app/components/namespaces/free_user_cap/notification_alert_component.rb'
- 'ee/app/components/namespaces/free_user_cap/usage_quota_alert_component.rb'
- 'ee/app/components/namespaces/free_user_cap/usage_quota_trial_alert_component.rb'
- 'ee/app/controllers/admin/elasticsearch_controller.rb'