diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-05 21:07:46 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-05 21:07:46 +0000 |
| commit | 82cef8dd1f48ffbc7aaa1ff7374cdb859137e01e (patch) | |
| tree | 0ebdac2f1880dd1dd3f73a956082759314e0994f /app/services/merge_requests | |
| parent | 2baa63e740214382387abe77eeea6c0b1759e621 (diff) | |
| download | gitlab-ce-82cef8dd1f48ffbc7aaa1ff7374cdb859137e01e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/merge_requests')
| -rw-r--r-- | app/services/merge_requests/ff_merge_service.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/services/merge_requests/ff_merge_service.rb b/app/services/merge_requests/ff_merge_service.rb index 479e0fe6699..cfbee3e2ff6 100644 --- a/app/services/merge_requests/ff_merge_service.rb +++ b/app/services/merge_requests/ff_merge_service.rb @@ -20,6 +20,10 @@ module MergeRequests rescue StandardError => e raise MergeError, "Something went wrong during merge: #{e.message}" ensure + if merge_request.squash + merge_request.update_column(:squash_commit_sha, merge_request.in_progress_merge_commit_sha) + end + merge_request.update(in_progress_merge_commit_sha: nil) end end |