diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-10 21:12:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-10 21:12:05 +0300 |
| commit | 2e2c1a521c03c8cd7ab57296016fee6350e29b07 (patch) | |
| tree | 26df83cd7566a6230d5218c446a213f02313314d /.rubocop_todo | |
| parent | 0a412bceb98cd7acd46701d75dbad9683cb33baf (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.rubocop_todo')
| -rw-r--r-- | .rubocop_todo/style/format_string.yml | 1 | ||||
| -rw-r--r-- | .rubocop_todo/style/if_unless_modifier.yml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.rubocop_todo/style/format_string.yml b/.rubocop_todo/style/format_string.yml index 66522603da2..6963e0f2aba 100644 --- a/.rubocop_todo/style/format_string.yml +++ b/.rubocop_todo/style/format_string.yml @@ -199,6 +199,7 @@ Style/FormatString: - 'ee/app/components/namespaces/free_user_cap/personal_usage_quota_limitations_alert_component.rb' - 'ee/app/components/namespaces/free_user_cap/preview_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' - 'ee/app/controllers/admin/geo/application_controller.rb' - 'ee/app/controllers/admin/geo/projects_controller.rb' diff --git a/.rubocop_todo/style/if_unless_modifier.yml b/.rubocop_todo/style/if_unless_modifier.yml index 00c570680d8..a58f71aee8f 100644 --- a/.rubocop_todo/style/if_unless_modifier.yml +++ b/.rubocop_todo/style/if_unless_modifier.yml @@ -470,7 +470,7 @@ Style/IfUnlessModifier: - 'db/post_migrate/20220128155814_fix_approval_rules_code_owners_rule_type_index.rb' - 'db/post_migrate/20220131000001_schedule_trace_expiry_removal.rb' - 'db/post_migrate/20220523171107_drop_deploy_tokens_token_column.rb' - - 'ee/app/components/namespaces/storage/limit_alert.rb' + - 'ee/app/components/namespaces/storage/limit_alert_component.rb' - 'ee/app/controllers/admin/elasticsearch_controller.rb' - 'ee/app/controllers/admin/emails_controller.rb' - 'ee/app/controllers/admin/geo/application_controller.rb' |