Commit 3a6694b5 authored by Valery Sizov's avatar Valery Sizov

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

parent 5abbada4
...@@ -32,7 +32,9 @@ class GitlabMerge ...@@ -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}\""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment