diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 5e9520c74fd239b5876c4750dbc00821ee03d131..f8474b0af3d17c5897e7ecd305bc811c70f1799a 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -621,13 +621,6 @@ Style/MixinUsage: - 'spec/factories/notes.rb' - 'spec/lib/gitlab/import_export/version_checker_spec.rb' -# Offense count: 2 -# Cop supports --auto-correct. -Style/MultilineIfModifier: - Exclude: - - 'app/services/ci/process_pipeline_service.rb' - - 'lib/api/commit_statuses.rb' - # Offense count: 29 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, MinBodyLength. diff --git a/app/services/ci/process_pipeline_service.rb b/app/services/ci/process_pipeline_service.rb index d84ef5fbb938a8fc66f789306baa8f3d4c64a6be..18bae26613f4d6f7a40067b194cacc392836630b 100644 --- a/app/services/ci/process_pipeline_service.rb +++ b/app/services/ci/process_pipeline_service.rb @@ -37,10 +37,12 @@ def update_retried .pluck(Arel.sql('MAX(id)'), 'name') # mark builds that are retried - pipeline.statuses.latest - .where(name: latest_statuses.map(&:second)) - .where.not(id: latest_statuses.map(&:first)) - .update_all(retried: true) if latest_statuses.any? + if latest_statuses.any? + pipeline.statuses.latest + .where(name: latest_statuses.map(&:second)) + .where.not(id: latest_statuses.map(&:first)) + .update_all(retried: true) + end end # rubocop: enable CodeReuse/ActiveRecord diff --git a/changelogs/unreleased/multiline-if-modifier.yml b/changelogs/unreleased/multiline-if-modifier.yml new file mode 100644 index 0000000000000000000000000000000000000000..d31430ecad79f671763cef086408dbf8348b8fb0 --- /dev/null +++ b/changelogs/unreleased/multiline-if-modifier.yml @@ -0,0 +1,5 @@ +--- +title: Fix Style/MultilineIfModifier cop +merge_request: 41113 +author: Rajendra Kadam +type: fixed diff --git a/lib/api/commit_statuses.rb b/lib/api/commit_statuses.rb index 140351c9e5cafa28fbbba588a8e89c795bffaf11..9f5a6e8750516eeb61312edd8040a67d795db505 100644 --- a/lib/api/commit_statuses.rb +++ b/lib/api/commit_statuses.rb @@ -117,8 +117,10 @@ class CommitStatuses < Grape::API::Instance render_api_error!('invalid state', 400) end - MergeRequest.where(source_project: user_project, source_branch: ref) - .update_all(head_pipeline_id: pipeline.id) if pipeline.latest? + if pipeline.latest? + MergeRequest.where(source_project: user_project, source_branch: ref) + .update_all(head_pipeline_id: pipeline.id) + end present status, with: Entities::CommitStatus rescue StateMachines::InvalidTransition => e