From 9bb15926760bbf825a9b32fca9037e14a80a5afd Mon Sep 17 00:00:00 2001 From: Siddharth Asthana Date: Wed, 14 Sep 2022 21:15:09 +0530 Subject: [PATCH] RuboCop: Enable previously disabled Style/BarePercentLiterals Changelog: other --- .rubocop_todo/style/bare_percent_literals.yml | 15 +++++++-------- .../_slack_integration_form.html.haml | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.rubocop_todo/style/bare_percent_literals.yml b/.rubocop_todo/style/bare_percent_literals.yml index 104ead817d52aa..1a155e3cca045b 100644 --- a/.rubocop_todo/style/bare_percent_literals.yml +++ b/.rubocop_todo/style/bare_percent_literals.yml @@ -1,16 +1,13 @@ --- # Cop supports --auto-correct. Style/BarePercentLiterals: - # Offense count: 220 - # Temporarily disabled due to too many offenses - Enabled: false + Details: grace period Exclude: - 'app/models/commit.rb' - 'app/models/concerns/storage/legacy_namespace.rb' - 'app/models/integrations/datadog.rb' - 'app/services/feature_flags/base_service.rb' - 'app/services/repositories/base_service.rb' - - 'app/services/repositories/destroy_service.rb' - 'ee/app/services/jira/jql_builder_service.rb' - 'ee/lib/ee/gitlab/checks/push_rules/file_size_check.rb' - 'ee/spec/features/projects/environments/environments_spec.rb' @@ -41,17 +38,15 @@ Style/BarePercentLiterals: - 'qa/qa/ee/page/project/show.rb' - 'qa/qa/ee/page/project/snippet/index.rb' - 'qa/qa/ee/page/project/wiki/show.rb' - - 'qa/qa/page/component/design_management.rb' - 'qa/qa/page/component/select2.rb' - 'qa/qa/page/element.rb' - 'qa/qa/page/file/form.rb' - 'qa/qa/page/project/web_ide/edit.rb' - 'qa/qa/resource/events/project.rb' - - 'qa/qa/resource/members.rb' + - 'qa/qa/resource/personal_access_token_cache.rb' - 'qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb' - - 'qa/qa/specs/features/ee/browser_ui/1_manage/group/group_saml_enforced_sso_new_account_spec.rb' + - 'qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_with_image_pull_policy_spec.rb' - 'qa/qa/specs/features/ee/browser_ui/3_create/repository/push_rules_spec.rb' - - 'qa/qa/support/page/logging.rb' - 'qa/spec/runtime/feature_spec.rb' - 'scripts/regenerate-schema' - 'scripts/trigger-build.rb' @@ -79,6 +74,7 @@ Style/BarePercentLiterals: - 'spec/lib/banzai/filter/references/label_reference_filter_spec.rb' - 'spec/lib/banzai/filter/references/milestone_reference_filter_spec.rb' - 'spec/lib/banzai/pipeline/full_pipeline_spec.rb' + - 'spec/lib/banzai/pipeline/incident_management/timeline_event_pipeline_spec.rb' - 'spec/lib/banzai/pipeline/plain_markdown_pipeline_spec.rb' - 'spec/lib/banzai/reference_parser/commit_parser_spec.rb' - 'spec/lib/banzai/reference_parser/issue_parser_spec.rb' @@ -95,6 +91,7 @@ Style/BarePercentLiterals: - 'spec/mailers/emails/releases_spec.rb' - 'spec/mailers/emails/service_desk_spec.rb' - 'spec/models/deployment_spec.rb' + - 'spec/models/incident_management/timeline_event_spec.rb' - 'spec/models/integrations/drone_ci_spec.rb' - 'spec/models/integrations/teamcity_spec.rb' - 'spec/models/project_label_spec.rb' @@ -102,6 +99,8 @@ Style/BarePercentLiterals: - 'spec/requests/api/ci/job_artifacts_spec.rb' - 'spec/requests/api/deployments_spec.rb' - 'spec/requests/api/graphql/mutations/snippets/destroy_spec.rb' + - 'spec/requests/api/graphql/project/incident_management/timeline_events_spec.rb' + - 'spec/requests/projects/packages/package_files_controller_spec.rb' - 'spec/rubocop/cop/gitlab/mark_used_feature_flags_spec.rb' - 'spec/services/prometheus/proxy_variable_substitution_service_spec.rb' - 'spec/support/banzai/reference_filter_shared_examples.rb' diff --git a/ee/app/views/shared/integrations/gitlab_slack_application/_slack_integration_form.html.haml b/ee/app/views/shared/integrations/gitlab_slack_application/_slack_integration_form.html.haml index 53505f57ef894a..9acf0ab365ca54 100644 --- a/ee/app/views/shared/integrations/gitlab_slack_application/_slack_integration_form.html.haml +++ b/ee/app/views/shared/integrations/gitlab_slack_application/_slack_integration_form.html.haml @@ -27,6 +27,6 @@ .gl-my-5 = render 'shared/integrations/gitlab_slack_application/slack_button', project: @project, label: s_('SlackIntegration|Reinstall Slack app') %p - = html_escape(s_('SlackIntegration|You may need to reinstall the Slack application when we %{linkStart}make updates or change permissions%{linkEnd}.')) % { linkStart: %Q().html_safe, linkEnd: ''.html_safe} + = html_escape(s_('SlackIntegration|You may need to reinstall the Slack application when we %{linkStart}make updates or change permissions%{linkEnd}.')) % { linkStart: %().html_safe, linkEnd: ''.html_safe} - else = render 'shared/integrations/gitlab_slack_application/slack_button', project: @project, label: s_('SlackIntegration|Install Slack app') -- GitLab