deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Auto-merge: checking via AJAX

Browse source
This commit is contained in:
Valery Sizov 2012-04-16 22:08:03 +03:00
parent f145450415
commit 8269a3a735
6 changed files with 43 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/controllers/merge_requests_controller.rb
View file

@ -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)