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

fast automerge: done

Browse source
This commit is contained in:
Valery Sizov 2012-04-22 16:14:01 +03:00
parent dcbb875c46
commit e5f8397fd4
5 changed files with 52 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/gitlab_merge.rb
View file

@ -29,10 +29,13 @@ class GitlabMerge
File.open(File.join(Rails.root, "tmp", "merge_repo", "#{project.path}.lock"), "w+") do |f|
f.flock(File::LOCK_EX)
unless project.satellite_exists?
unless project.satellite.exists?
raise "You should run: rake gitlab_enable_automerge"
end
Dir.chdir(project.path_to_repo_satellite) do
project.satellite.clear
Dir.chdir(project.satellite.path) do
merge_repo = Grit::Repo.new('.')
merge_repo.git.sh "git fetch origin"
merge_repo.git.sh "git config user.name \"#{user.name}\""