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

Auto-merge: reise exception when gitlab do not have access to repo

Browse source
This commit is contained in:
Valery Sizov 2012-04-16 23:49:57 +03:00
parent 5abbada41e
commit 3a6694b551
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/gitlab_merge.rb
View file

@ -32,7 +32,9 @@ class GitlabMerge
f.flock(File::LOCK_EX) f.flock(File::LOCK_EX)
self.project.repo.git.clone({:branch => merge_request.target_branch}, project.url_to_repo, merge_path) self.project.repo.git.clone({:branch => merge_request.target_branch}, project.url_to_repo, merge_path)
#TODO When user do not have permissions then raise exception unless File.exist?(self.merge_path)
raise "Gitlab user do not have access to repo. You should run: rake gitlab_enable_automerge"
end
Dir.chdir(merge_path) do Dir.chdir(merge_path) do
merge_repo = Grit::Repo.new('.') merge_repo = Grit::Repo.new('.')
merge_repo.git.sh "git config user.name \"#{user.name}\"" merge_repo.git.sh "git config user.name \"#{user.name}\""