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

Auto-merge: checking via AJAX

Browse source
This commit is contained in:
Valery Sizov 2012-04-16 22:08:03 +03:00
parent f145450415
commit 8269a3a735
6 changed files with 43 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/gitlab_merge.rb
View file

@ -29,6 +29,7 @@ class GitlabMerge
def pull
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
Dir.chdir(merge_path) do
merge_repo = Grit::Repo.new('.')
merge_repo.git.sh "git config user.name \"#{user.name}\""