diff --git a/.gitlab/issue_templates/Feature Flag Roll Out.md b/.gitlab/issue_templates/Feature Flag Roll Out.md index 171f55a5101..7aeecc94cec 100644 --- a/.gitlab/issue_templates/Feature Flag Roll Out.md +++ b/.gitlab/issue_templates/Feature Flag Roll Out.md @@ -101,7 +101,7 @@ To do so, follow these steps: If the merge request was deployed before [the monthly release was tagged](https://about.gitlab.com/handbook/engineering/releases/#self-managed-releases-1), the feature can be officially announced in a release blog post: `/chatops run release check ` - [ ] After the default-enabling MR has been deployed, clean up the feature flag from all environments by running these chatops command in the `#production` channel: `/chatops run feature delete --dev --pre --staging --staging-ref --production` -- [ ] Close [the feature issue][] to indicate the feature will be released in the current milestone. +- [ ] Close [the feature issue]() to indicate the feature will be released in the current milestone. - [ ] Set the next milestone to this rollout issue for scheduling [the flag removal](#release-the-feature). - [ ] (Optional) You can [create a separate issue](https://gitlab.com/gitlab-org/gitlab/-/issues/new?issuable_template=Feature%20Flag%20Cleanup) for scheduling the steps below to [Release the feature](#release-the-feature). - [ ] Set the title to "[Feature flag] Cleanup ``". @@ -128,7 +128,7 @@ or use the checklist below in this same issue. - [ ] Ensure that the cleanup MR has been included in the release package. If the merge request was deployed before [the monthly release was tagged](https://about.gitlab.com/handbook/engineering/releases/#self-managed-releases-1), the feature can be officially announced in a release blog post: `/chatops run release check ` -- [ ] Close [the feature issue][] to indicate the feature will be released in the current milestone. +- [ ] Close [the feature issue]() to indicate the feature will be released in the current milestone. - [ ] Once the cleanup MR has been deployed to production, clean up the feature flag from all environments by running these chatops command in `#production` channel: `/chatops run feature delete --dev --pre --staging --staging-ref --production` - [ ] Close this rollout issue. diff --git a/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml b/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml index e543c5fff18..baceb196313 100644 --- a/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml +++ b/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml @@ -392,7 +392,7 @@ Layout/LineEndStringConcatenationIndentation: - 'qa/qa/service/docker_run/product_analytics/dotnet_sdk_app.rb' - 'qa/qa/specs/features/ee/api/10_govern/compliance_pipeline_spec.rb' - 'qa/qa/specs/features/ee/browser_ui/10_govern/export_vulnerability_report_spec.rb' - - 'qa/qa/specs/features/ee/browser_ui/9_data_stores/elasticsearch/elasticsearch_reindexing_spec.rb' + - 'qa/qa/specs/features/ee/browser_ui/9_tenant_scale/elasticsearch/elasticsearch_reindexing_spec.rb' - 'qa/qa/support/system_logs/kibana.rb' - 'qa/qa/tools/revoke_user_personal_access_tokens.rb' - 'qa/qa/tools/test_resources_handler.rb' diff --git a/.rubocop_todo/rspec/example_without_description.yml b/.rubocop_todo/rspec/example_without_description.yml index 770c6ccceee..e931808fc78 100644 --- a/.rubocop_todo/rspec/example_without_description.yml +++ b/.rubocop_todo/rspec/example_without_description.yml @@ -218,7 +218,7 @@ RSpec/ExampleWithoutDescription: - 'ee/spec/workers/group_destroy_worker_spec.rb' - 'ee/spec/workers/security/scan_execution_policies/create_pipeline_worker_spec.rb' - 'ee/spec/workers/security/scan_execution_policies/rule_schedule_worker_spec.rb' - - 'qa/qa/specs/features/browser_ui/9_data_stores/project/dashboard_images_spec.rb' + - 'qa/qa/specs/features/browser_ui/9_tenant_scale/project/dashboard_images_spec.rb' - 'qa/spec/specs/helpers/feature_flag_spec.rb' - 'spec/bin/audit_event_type_spec.rb' - 'spec/bin/feature_flag_spec.rb' diff --git a/.rubocop_todo/rspec/no_expectation_example.yml b/.rubocop_todo/rspec/no_expectation_example.yml index ce96a4fd7ad..aba6b37def4 100644 --- a/.rubocop_todo/rspec/no_expectation_example.yml +++ b/.rubocop_todo/rspec/no_expectation_example.yml @@ -47,7 +47,7 @@ RSpec/NoExpectationExample: - 'qa/qa/specs/features/browser_ui/4_verify/ci_variable/ui_variable_inheritable_when_forward_pipeline_variables_true_spec.rb' - 'qa/qa/specs/features/browser_ui/4_verify/ci_variable/ui_variable_non_inheritable_when_forward_pipeline_variables_false_spec.rb' - 'qa/qa/specs/features/ee/api/2_plan/epics_to_work_items_sync_spec.rb' - - 'qa/qa/specs/features/ee/api/9_data_stores/elasticsearch/elasticsearch_api_spec.rb' + - 'qa/qa/specs/features/ee/api/9_tenant_scale/elasticsearch/elasticsearch_api_spec.rb' - 'qa/qa/specs/features/ee/browser_ui/10_govern/change_vulnerability_status_spec.rb' - 'qa/qa/specs/features/ee/browser_ui/10_govern/group/group_ldap_sync_spec.rb' - 'qa/qa/specs/features/ee/browser_ui/10_govern/security_reports_spec.rb' diff --git a/app/assets/javascripts/access_tokens/components/access_token_table_app.vue b/app/assets/javascripts/access_tokens/components/access_token_table_app.vue index e72c0909059..bb45a9c4721 100644 --- a/app/assets/javascripts/access_tokens/components/access_token_table_app.vue +++ b/app/assets/javascripts/access_tokens/components/access_token_table_app.vue @@ -46,7 +46,8 @@ export default { i18n: { button: { revoke: s__('AccessTokens|Revoke'), - revokeAriaLabel: (name) => sprintf(s__('AccessTokens|Revoke %{name}'), { name }).trim(), + revokeAriaLabel: (name) => + sprintf(s__('AccessTokens|Revoke %{name}'), { name }, false).trim(), rotate: s__('AccessTokens|Rotate'), }, emptyDateField: __('Never'), @@ -216,10 +217,14 @@ export default { } }, modalMessage(tokenName, action) { - return sprintf(this.$options.i18n.modal.message[action], { - accessTokenType: this.accessTokenType, - tokenName, - }); + return sprintf( + this.$options.i18n.modal.message[action], + { + accessTokenType: this.accessTokenType, + tokenName, + }, + false, + ); }, sortingChanged(aRow, bRow, key) { if (['createdAt', 'lastUsedAt', 'expiresAt'].includes(key)) { diff --git a/app/assets/javascripts/achievements/components/achievements_form.vue b/app/assets/javascripts/achievements/components/achievements_form.vue index 3a99b48e7e0..42717b19136 100644 --- a/app/assets/javascripts/achievements/components/achievements_form.vue +++ b/app/assets/javascripts/achievements/components/achievements_form.vue @@ -240,7 +240,7 @@ export default {
- {{ __('Choose File...') }} + {{ __('Choose File…') }}