diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-07-23 07:35:39 +0100 |
|---|---|---|
| committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-09-12 14:35:12 +0100 |
| commit | cce12c8b53f0f2eeed32fc7bbd0fdc67511f4976 (patch) | |
| tree | e672e735dc4aff83fee9eb78298048f8e18e6070 | |
| parent | cb00afe380418ad975e8fbb881eb4e418b645b49 (diff) | |
| download | gitlab-ce-cce12c8b53f0f2eeed32fc7bbd0fdc67511f4976.tar.gz | |
Fixed accepting MR?
| -rw-r--r-- | app/assets/javascripts/merge_request_widget.js.coffee | 6 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee index 326f72d6e0a..5c30f1047fc 100644 --- a/app/assets/javascripts/merge_request_widget.js.coffee +++ b/app/assets/javascripts/merge_request_widget.js.coffee @@ -32,13 +32,13 @@ class @MergeRequestWidget getInputs: -> @acceptMergeRequestInput = $('.accept-mr-form :input') + @commitMessageInput = $('textarea[name=commit_message]') @mergeWhenSucceedsInput = $('input[name=merge_when_build_succeeds]') @removeSourceBranchInput = $('input[name=should_remove_source_branch]') + @shaInput = $('input[name=sha]') + @utfInput = $('input[name=utf8]') @authenticityTokenInput = $('input[name=authenticity_token]', @mergeRequestWidget) - @commitMessageInput = $('textarea[name=commit_message]', @mergeRequestWidget) - @shaInput = $('input[name=sha]', @mergeRequestWidget) - @utfInput = $('input[name=utf8]', @mergeRequestWidget) getButtons: (skipListeners) -> @dynamicMergeButton = $('.js-merge-button') diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 07ccdb5ae84..f9676633cf2 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -353,7 +353,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController def render_merge_request_widget_partial case @status when :success - render json: { merge_in_progress: (params[:should_remove_source_branch] == '1') } + render json: { merge_in_progress: true } when :merge_when_build_succeeds render partial: 'projects/merge_requests/widget/open/merge_when_build_succeeds', layout: false when :sha_mismatch |