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

Task#755 auto-merge don`t work correctly.

Browse source
This commit is contained in:
Zevs 2012-04-30 00:23:19 +03:00
parent 903f9491ba
commit c937d06c3c
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/gitlab_merge.rb
View file

@ -8,14 +8,16 @@ class GitlabMerge
end end
def can_be_merged? def can_be_merged?
result = false
process do |repo, output| process do |repo, output|
!(output =~ /Automatic merge failed/) result = !(output =~ /CONFLICT/)
end end
result
end end
def merge def merge
process do |repo, output| process do |repo, output|
if output =~ /Automatic merge failed/ if output =~ /CONFLICT/
false false
else else
repo.git.push({}, "origin", merge_request.target_branch) repo.git.push({}, "origin", merge_request.target_branch)
@ -39,6 +41,7 @@ class GitlabMerge
Dir.chdir(project.satellite.path) do Dir.chdir(project.satellite.path) do
merge_repo = Grit::Repo.new('.') merge_repo = Grit::Repo.new('.')
merge_repo.git.sh "git reset --hard"
merge_repo.git.sh "git fetch origin" merge_repo.git.sh "git fetch origin"
merge_repo.git.sh "git config user.name \"#{user.name}\"" merge_repo.git.sh "git config user.name \"#{user.name}\""
merge_repo.git.sh "git config user.email \"#{user.email}\"" merge_repo.git.sh "git config user.email \"#{user.email}\""