diff options
Diffstat (limited to 'app/controllers/merge_requests_controller.rb')
| -rw-r--r-- | app/controllers/merge_requests_controller.rb | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/app/controllers/merge_requests_controller.rb b/app/controllers/merge_requests_controller.rb index b3776c0af27..18ad578fc83 100644 --- a/app/controllers/merge_requests_controller.rb +++ b/app/controllers/merge_requests_controller.rb @@ -2,7 +2,7 @@ class MergeRequestsController < ApplicationController before_filter :authenticate_user! before_filter :project before_filter :module_enabled - before_filter :merge_request, :only => [:edit, :update, :destroy, :show, :commits, :diffs, :automerge] + before_filter :merge_request, :only => [:edit, :update, :destroy, :show, :commits, :diffs, :automerge, :automerge_check] layout "project" # Authorize @@ -45,10 +45,6 @@ class MergeRequestsController < ApplicationController # or from cache if already merged @commits = @merge_request.commits - if @merge_request.unchecked? - @merge_request.check_if_can_be_merged - end - respond_to do |format| format.html format.js @@ -100,6 +96,13 @@ class MergeRequestsController < ApplicationController end end + def automerge_check + if @merge_request.unchecked? + @merge_request.check_if_can_be_merged + end + render :json => {:state => @merge_request.human_state} + end + def automerge render_404 unless @merge_request.open? && @merge_request.can_be_merged? return access_denied! unless can?(current_user, :accept_mr, @project) |