diff options
author | Shinya Maeda <shinya@gitlab.com> | 2019-06-26 14:58:24 +0300 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2019-07-04 09:26:39 +0300 |
commit | df3a0f261360b319d553c7122ac1e7abe6099de0 (patch) | |
tree | 957c5456032f69b4677404d407a27ed48f62c9e2 /app | |
parent | 19dc1105524e3d25821670706a750043775588fa (diff) |
Fix MWPS system notes shows inconsistent sha
Fix the system note service
Diffstat (limited to 'app')
-rw-r--r-- | app/services/auto_merge/merge_when_pipeline_succeeds_service.rb | 2 | ||||
-rw-r--r-- | app/services/system_note_service.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/services/auto_merge/merge_when_pipeline_succeeds_service.rb b/app/services/auto_merge/merge_when_pipeline_succeeds_service.rb index c41073a73e9..cde8c19e8fc 100644 --- a/app/services/auto_merge/merge_when_pipeline_succeeds_service.rb +++ b/app/services/auto_merge/merge_when_pipeline_succeeds_service.rb @@ -5,7 +5,7 @@ module AutoMerge def execute(merge_request) super do if merge_request.saved_change_to_auto_merge_enabled? - SystemNoteService.merge_when_pipeline_succeeds(merge_request, project, current_user, merge_request.diff_head_commit) + SystemNoteService.merge_when_pipeline_succeeds(merge_request, project, current_user, merge_request.actual_head_pipeline.sha) end end end diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb index 237ddbcf2c2..4783417ad6d 100644 --- a/app/services/system_note_service.rb +++ b/app/services/system_note_service.rb @@ -221,8 +221,8 @@ module SystemNoteService end # Called when 'merge when pipeline succeeds' is executed - def merge_when_pipeline_succeeds(noteable, project, author, last_commit) - body = "enabled an automatic merge when the pipeline for #{last_commit.to_reference(project)} succeeds" + def merge_when_pipeline_succeeds(noteable, project, author, sha) + body = "enabled an automatic merge when the pipeline for #{sha} succeeds" create_note(NoteSummary.new(noteable, project, author, body, action: 'merge')) end |