From 7e1e5eddaa8a2a075129ae19d223ee2f8758715d Mon Sep 17 00:00:00 2001 From: Peter Leitzen Date: Thu, 1 Dec 2022 13:27:02 +0100 Subject: [PATCH 1/2] Enable disabled cop Layout/SpaceInLambdaLiteral in grace period --- .rubocop_todo/layout/space_in_lambda_literal.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.rubocop_todo/layout/space_in_lambda_literal.yml b/.rubocop_todo/layout/space_in_lambda_literal.yml index 6bb31295fbd9da..0bd511b1790603 100644 --- a/.rubocop_todo/layout/space_in_lambda_literal.yml +++ b/.rubocop_todo/layout/space_in_lambda_literal.yml @@ -1,9 +1,7 @@ --- # Cop supports --autocorrect. Layout/SpaceInLambdaLiteral: - # Offense count: 1061 - # Temporarily disabled due to too many offenses - Enabled: false + Details: grace period Exclude: - 'app/controllers/concerns/issuable_actions.rb' - 'app/controllers/projects/ci/daily_build_group_report_results_controller.rb' @@ -210,7 +208,6 @@ Layout/SpaceInLambdaLiteral: - 'ee/app/models/concerns/issue_widgets/acts_like_requirement.rb' - 'ee/app/models/dast/profile.rb' - 'ee/app/models/dast/profile_schedule.rb' - - 'ee/app/models/dast/site_profile_secret_variable.rb' - 'ee/app/models/dast_scanner_profile.rb' - 'ee/app/models/dast_site_profile.rb' - 'ee/app/models/dast_site_validation.rb' @@ -351,6 +348,7 @@ Layout/SpaceInLambdaLiteral: - 'lib/api/entities/namespace.rb' - 'lib/api/entities/project.rb' - 'lib/api/entities/release.rb' + - 'lib/api/entities/ssh_key.rb' - 'lib/api/entities/todo.rb' - 'lib/api/events.rb' - 'lib/api/feature_flags_user_lists.rb' -- GitLab From 21427f9df8037ba499dd2d021593a09f60295d52 Mon Sep 17 00:00:00 2001 From: Peter Leitzen Date: Thu, 1 Dec 2022 13:33:33 +0100 Subject: [PATCH 2/2] Fix Layout/SpaceInLambdaLiteral offenses in HAML files --- app/views/projects/commits/_commits.html.haml | 4 ++-- .../views/groups/settings/_delayed_project_removal.html.haml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/projects/commits/_commits.html.haml b/app/views/projects/commits/_commits.html.haml index b5ecc9b019351c..b79f17ae7b3169 100644 --- a/app/views/projects/commits/_commits.html.haml +++ b/app/views/projects/commits/_commits.html.haml @@ -15,7 +15,7 @@ %li.commits-row{ data: { day: day } } %ul.content-list.commit-list.flex-list - if Feature.enabled?(:cached_commits, project) - = render partial: 'projects/commits/commit', collection: daily_commits, locals: { project: project, ref: ref, merge_request: merge_request }, cached: -> (commit) { commit_partial_cache_key(commit, ref: ref, merge_request: merge_request, request: request) } + = render partial: 'projects/commits/commit', collection: daily_commits, locals: { project: project, ref: ref, merge_request: merge_request }, cached: ->(commit) { commit_partial_cache_key(commit, ref: ref, merge_request: merge_request, request: request) } - else = render partial: 'projects/commits/commit', collection: daily_commits, locals: { project: project, ref: ref, merge_request: merge_request } @@ -29,7 +29,7 @@ %li.commits-row %ul.content-list.commit-list.flex-list - if Feature.enabled?(:cached_commits, project) - = render partial: 'projects/commits/commit', collection: context_commits, locals: { project: project, ref: ref, merge_request: merge_request }, cached: -> (commit) { commit_partial_cache_key(commit, ref: ref, merge_request: merge_request, request: request) } + = render partial: 'projects/commits/commit', collection: context_commits, locals: { project: project, ref: ref, merge_request: merge_request }, cached: ->(commit) { commit_partial_cache_key(commit, ref: ref, merge_request: merge_request, request: request) } - else = render partial: 'projects/commits/commit', collection: context_commits, locals: { project: project, ref: ref, merge_request: merge_request } diff --git a/ee/app/views/groups/settings/_delayed_project_removal.html.haml b/ee/app/views/groups/settings/_delayed_project_removal.html.haml index 6920a52d3f29c6..865a84462737cf 100644 --- a/ee/app/views/groups/settings/_delayed_project_removal.html.haml +++ b/ee/app/views/groups/settings/_delayed_project_removal.html.haml @@ -10,7 +10,7 @@ - if setting_locked = render 'shared/namespaces/cascading_settings/lock_icon', attribute: :delayed_project_removal, group: group, - settings_path_helper: -> (locked_ancestor) { edit_group_path(locked_ancestor, anchor: 'js-permissions-settings') }, + settings_path_helper: ->(locked_ancestor) { edit_group_path(locked_ancestor, anchor: 'js-permissions-settings') }, class_list: 'gl-relative!' %span.form-text.text-muted.gl-pb-4 = delayed_project_removal_help_text -- GitLab