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

Unverify MR on every push. Ajax for MR accept. better UI

Browse source
This commit is contained in:
randx 2012-03-30 08:15:04 +03:00
parent 411d84f385
commit 3824f9b372
5 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/merge_requests_controller.rb
View file

@ -90,6 +90,7 @@ class MergeRequestsController < ApplicationController
respond_to do |format|
if @merge_request.update_attributes(params[:merge_request].merge(:author_id_of_changes => current_user.id))
@merge_request.reload_code
@merge_request.mark_as_unchecked
format.html { redirect_to [@project, @merge_request], notice: 'Merge request was successfully updated.' }
format.json { head :ok }
else
@ -101,8 +102,7 @@ class MergeRequestsController < ApplicationController
def automerge
render_404 unless @merge_request.open? && @merge_request.can_be_merged?
message = @merge_request.automerge! ? "Successfully merged" : "Can not be merged"
redirect_to [@merge_request.project, @merge_request], :alert => message
@merge_request.automerge!(current_user)
end
def destroy