From df3a0f261360b319d553c7122ac1e7abe6099de0 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Wed, 26 Jun 2019 18:58:24 +0700 Subject: Fix MWPS system notes shows inconsistent sha Fix the system note service --- app/services/auto_merge/merge_when_pipeline_succeeds_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/services/auto_merge') 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 -- cgit v1.2.3