diff options
| author | Phil Hughes <me@iamphill.com> | 2018-03-12 15:14:02 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-03-13 18:38:39 +0300 |
| commit | 3833d91961c2613ed26a8071f9db2b418df5b63e (patch) | |
| tree | 50278404c1025bef2e9c7b3338fc76f8107e8cb0 /app/assets | |
| parent | 00770565d274ca9c9b021c59f8a7959ff40b6a2f (diff) | |
Merge branch '42814-fix-remove-source-branch-when-mwps' into 'master'
Fix "Remove source branch" button in MR widget during MWPS state
Closes #42814 and #4281
See merge request gitlab-org/gitlab-ce!17192
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue index de98a77be6f..7ff7fc7988a 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue @@ -63,7 +63,7 @@ }; this.isRemovingSourceBranch = true; - this.service.mergeResource.save(options) + this.service.merge(options) .then(res => res.data) .then((data) => { if (data.status === 'merge_when_pipeline_succeeds') { |