Raw gitlab automerge feature

This commit is contained in:
randx 2012-03-29 18:03:05 +03:00
parent 8ee0993fdf
commit 78d620b3b6
3 changed files with 44 additions and 1 deletions

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]
before_filter :merge_request, :only => [:edit, :update, :destroy, :show, :commits, :diffs, :automerge]
layout "project"
# Authorize
@ -95,6 +95,22 @@ class MergeRequestsController < ApplicationController
end
end
def automerge
message = ""
if GitlabMerge.new(@merge_request).merge
@merge_request.update_attributes(
:author_id_of_changes => current_user.id,
:closed => true
)
@merge_request.reload_code
message = "Successfully merged"
else
message = "Can not be merged"
end
redirect_to [@merge_request.project, @merge_request], :alert => message
end
def destroy
@merge_request.destroy