From 1e1536a0a156e72bf677cc2f33caeab591dda4b1 Mon Sep 17 00:00:00 2001 From: Siddharth Asthana Date: Fri, 5 Aug 2022 17:59:42 +0530 Subject: [PATCH 1/2] RuboCop: Enable previously disabled Style/SingleArgumentDig Changelog: other --- .rubocop_todo/style/single_argument_dig.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.rubocop_todo/style/single_argument_dig.yml b/.rubocop_todo/style/single_argument_dig.yml index 860183426e9d8e..3ffd27d26ae795 100644 --- a/.rubocop_todo/style/single_argument_dig.yml +++ b/.rubocop_todo/style/single_argument_dig.yml @@ -1,9 +1,7 @@ --- # Cop supports --auto-correct. Style/SingleArgumentDig: - # Offense count: 150 - # Temporarily disabled due to too many offenses - Enabled: false + Details: grace period Exclude: - 'app/graphql/resolvers/namespace_projects_resolver.rb' - 'app/models/ci/build.rb' @@ -22,6 +20,7 @@ Style/SingleArgumentDig: - 'ee/app/workers/concerns/elastic/migration_helper.rb' - 'ee/lib/gitlab/ci/parsers/security/dependency_list.rb' - 'ee/lib/gitlab/subscription_portal/clients/graphql.rb' + - 'ee/spec/elastic/migrate/20220119120500_populate_commit_permissions_in_main_index_spec.rb' - 'ee/spec/graphql/mutations/vulnerabilities/create_spec.rb' - 'ee/spec/lib/ee/gitlab/ci/parsers/security/common_spec.rb' - 'ee/spec/lib/ee/gitlab/ci/pipeline/chain/validate/external_spec.rb' @@ -35,10 +34,11 @@ Style/SingleArgumentDig: - 'ee/spec/requests/api/graphql/project/dast_site_profiles_spec.rb' - 'ee/spec/requests/api/graphql/project/requirements_management/requirements_spec.rb' - 'ee/spec/requests/api/internal/upcoming_reconciliations_spec.rb' + - 'ee/spec/services/vulnerabilities/findings/find_or_create_from_security_finding_service_spec.rb' - 'ee/spec/services/vulnerabilities/manually_create_service_spec.rb' + - 'lib/gitlab/auth/o_auth/auth_hash.rb' - 'lib/gitlab/ci/badge/coverage/template.rb' - - 'lib/gitlab/ci/badge/pipeline/template.rb' - - 'lib/gitlab/ci/badge/release/template.rb' + - 'lib/gitlab/ci/badge/template.rb' - 'lib/gitlab/ci/lint.rb' - 'lib/gitlab/ci/parsers/accessibility/pa11y.rb' - 'lib/gitlab/ci/parsers/security/common.rb' @@ -51,11 +51,13 @@ Style/SingleArgumentDig: - 'lib/gitlab/database/transaction/observer.rb' - 'lib/gitlab/serverless/service.rb' - 'qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb' + - 'qa/qa/vendor/mail_hog/api.rb' - 'spec/controllers/graphql_controller_spec.rb' - 'spec/graphql/types/release_links_type_spec.rb' - 'spec/helpers/projects_helper_spec.rb' - 'spec/lib/gitlab/ci/yaml_processor_spec.rb' - 'spec/requests/api/ci/runner/jobs_request_post_spec.rb' + - 'spec/requests/api/graphql/ci/instance_variables_spec.rb' - 'spec/requests/api/graphql/container_repository/container_repository_details_spec.rb' - 'spec/requests/api/graphql/project/container_repositories_spec.rb' - 'spec/requests/api/graphql/project/jira_import_spec.rb' -- GitLab From 4c3038733ebecec0bcb0bb3837a20d7522ae94da Mon Sep 17 00:00:00 2001 From: Siddharth Asthana Date: Wed, 21 Sep 2022 11:14:20 +0530 Subject: [PATCH 2/2] Fix RuboCop offenses for Style/SingleArgumentDig in HAML Changelog: other EE: true --- ee/app/views/shared/_shared_runners_minutes_limit.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/app/views/shared/_shared_runners_minutes_limit.html.haml b/ee/app/views/shared/_shared_runners_minutes_limit.html.haml index 2bc32457a72c69..66fc4871caabdb 100644 --- a/ee/app/views/shared/_shared_runners_minutes_limit.html.haml +++ b/ee/app/views/shared/_shared_runners_minutes_limit.html.haml @@ -1,4 +1,4 @@ -- notification = ::Ci::Minutes::Notification.new(local_assigns.dig(:project), local_assigns.dig(:namespace)) +- notification = ::Ci::Minutes::Notification.new(local_assigns[:project], local_assigns[:namespace]) - namespace ||= project.namespace - return unless notification.show?(current_user, cookies) -- GitLab