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

Zevs
1 parent 903f9491
Showing 1 changed file with 5 additions and 2 deletions Show diff stats
lib/gitlab_merge.rb
@@ -8,14 +8,16 @@ class GitlabMerge
   end
  
   def can_be_merged?
+    result = false
     process do |repo, output|
-      !(output =~ /Automatic merge failed/)
+      result = !(output =~ /CONFLICT/)
     end
+    result
   end
  
   def merge
     process do |repo, output|
-      if output =~ /Automatic merge failed/
+      if output =~ /CONFLICT/
         false  
       else 
         repo.git.push({}, "origin", merge_request.target_branch)
@@ -39,6 +41,7 @@ class GitlabMerge
  
         Dir.chdir(project.satellite.path) do
           merge_repo = Grit::Repo.new('.')
+          merge_repo.git.sh "git reset --hard"
           merge_repo.git.sh "git fetch origin"
           merge_repo.git.sh "git config user.name \"#{user.name}\""
           merge_repo.git.sh "git config user.email \"#{user.email}\""
...	...	@@ -8,14 +8,16 @@ class GitlabMerge
8	8	end
9	9
10	10	def can_be_merged?
	11	+ result = false
11	12	process do \|repo, output\|
12		- !(output =~ /Automatic merge failed/)
	13	+ result = !(output =~ /CONFLICT/)
13	14	end
	15	+ result
14	16	end
15	17
16	18	def merge
17	19	process do \|repo, output\|
18		- if output =~ /Automatic merge failed/
	20	+ if output =~ /CONFLICT/
19	21	false
20	22	else
21	23	repo.git.push({}, "origin", merge_request.target_branch)
...	...	@@ -39,6 +41,7 @@ class GitlabMerge
39	41
40	42	Dir.chdir(project.satellite.path) do
41	43	merge_repo = Grit::Repo.new('.')
	44	+ merge_repo.git.sh "git reset --hard"
42	45	merge_repo.git.sh "git fetch origin"
43	46	merge_repo.git.sh "git config user.name \"#{user.name}\""
44	47	merge_repo.git.sh "git config user.email \"#{user.email}\""
...	...