diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-07-23 20:35:05 +0100 |
|---|---|---|
| committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-09-12 14:35:12 +0100 |
| commit | 8ae6d347806229d26d258b9b8de001351a4fb1af (patch) | |
| tree | 059799b15825a75338870e5460430a1227a48aa5 | |
| parent | c9a8bd75e075f65ef2f08eeccc7fc7e92c111788 (diff) | |
| download | gitlab-ce-8ae6d347806229d26d258b9b8de001351a4fb1af.tar.gz | |
Fixing last tests, MR acceptance isn't quite right yes
| -rw-r--r-- | app/assets/javascripts/merge_request_widget.js.coffee | 3 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee index 0dd122fddce..5c12c9ebcc5 100644 --- a/app/assets/javascripts/merge_request_widget.js.coffee +++ b/app/assets/javascripts/merge_request_widget.js.coffee @@ -206,7 +206,8 @@ class @MergeRequestWidget merge_when_build_succeeds: @mergeWhenSucceedsInput.val() should_remove_source_branch: @removeSourceBranchInput.val() if @removeSourceBranchInput.is ':checked' .done (res) => - if res.merge_in_progress + console.log res, 'res' + if res.merge_in_progress? @mergeInProgress res.merge_in_progress else @mergeRequestWidgetBody.html res diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 0efde5c5e53..ac634b988ff 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -356,7 +356,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController def render_merge_request_widget_partial case @status when :success - render json: { merge_in_progress: true } + render json: { merge_in_progress: params[:should_remove_source_branch] == '1' } when :merge_when_build_succeeds render partial: 'projects/merge_requests/widget/open/merge_when_build_succeeds', layout: false when :sha_mismatch |