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/services/auto_merge | |
| parent | 19dc1105524e3d25821670706a750043775588fa (diff) | |
Fix MWPS system notes shows inconsistent sha
Fix the system note service
Diffstat (limited to 'app/services/auto_merge')
| -rw-r--r-- | app/services/auto_merge/merge_when_pipeline_succeeds_service.rb | 2 |
1 files changed, 1 insertions, 1 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 |