From 3a6694b5516f4c5015a7745cf8182e74597b39ad Mon Sep 17 00:00:00 2001 From: Valery Sizov Date: Mon, 16 Apr 2012 23:49:57 +0300 Subject: Auto-merge: reise exception when gitlab do not have access to repo --- lib/gitlab_merge.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/gitlab_merge.rb b/lib/gitlab_merge.rb index 95942d5ca50..66a0e7ec635 100644 --- a/lib/gitlab_merge.rb +++ b/lib/gitlab_merge.rb @@ -32,7 +32,9 @@ class GitlabMerge f.flock(File::LOCK_EX) 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 merge_repo = Grit::Repo.new('.') merge_repo.git.sh "git config user.name \"#{user.name}\"" -- cgit v1.2.1