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

Merge Button v1 complete

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-03-30 20:49:34 +03:00
parent 464cd59dff
commit 90748cf724
6 changed files with 31 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/gitlab_merge.rb
View file

@ -1,7 +1,8 @@
class GitlabMerge
attr_accessor :project, :merge_path, :merge_request
attr_accessor :project, :merge_path, :merge_request, :user
def initialize(merge_request)
def initialize(merge_request, user)
self.user = user
self.merge_request = merge_request
self.project = merge_request.project
self.merge_path = File.join(Rails.root, "tmp", "merge_repo", project.path, merge_request.id.to_s)
@ -30,7 +31,9 @@ class GitlabMerge
self.project.repo.git.clone({:branch => merge_request.target_branch}, project.url_to_repo, merge_path)
Dir.chdir(merge_path) do
merge_repo = Grit::Repo.new('.')
output = merge_repo.git.pull({}, "origin", merge_request.source_branch)
merge_repo.git.sh "git config user.name \"#{user.name}\""
merge_repo.git.sh "git config user.email \"#{user.email}\""
output = merge_repo.git.pull({}, "--no-ff", "origin", merge_request.source_branch)
yield(merge_repo, output)
end
end