From 8ae6d347806229d26d258b9b8de001351a4fb1af Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Sat, 23 Jul 2016 20:35:05 +0100 Subject: Fixing last tests, MR acceptance isn't quite right yes --- app/assets/javascripts/merge_request_widget.js.coffee | 3 ++- 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 -- cgit v1.2.1