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' diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue index 90830f344d5..2f182b86d2c 100644 --- a/app/assets/javascripts/groups/components/group_item.vue +++ b/app/assets/javascripts/groups/components/group_item.vue @@ -179,6 +179,7 @@ export default { >
- {{ milestone.title }} + {{ + milestone.title + }} {{ __('Milestone') }}
{{ milestone.title }}
diff --git a/app/assets/javascripts/issuable/popover/components/issue_popover.vue b/app/assets/javascripts/issuable/popover/components/issue_popover.vue index 0cafaa1e500..4ae6de4783c 100644 --- a/app/assets/javascripts/issuable/popover/components/issue_popover.vue +++ b/app/assets/javascripts/issuable/popover/components/issue_popover.vue @@ -1,15 +1,25 @@