Set mr_diff state to collected if diff is ok

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Set mr_diff state to collected if diff is ok
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets
1 parent 193a5ed3
Showing 1 changed file with 4 additions and 1 deletions Show diff stats
app/models/merge_request_diff.rb
@@ -130,7 +130,10 @@ class MergeRequestDiff &lt; ActiveRecord::Base
       end
     end
  
-    new_diffs = dump_commits(new_diffs) if new_diffs.present?
+    if new_diffs.present?
+      new_diffs = dump_commits(new_diffs)
+      self.state = :collected
+    end
  
     self.st_diffs = new_diffs
     self.save
...	...	@@ -130,7 +130,10 @@ class MergeRequestDiff < ActiveRecord::Base
130	130	end
131	131	end
132	132
133		- new_diffs = dump_commits(new_diffs) if new_diffs.present?
	133	+ if new_diffs.present?
	134	+ new_diffs = dump_commits(new_diffs)
	135	+ self.state = :collected
	136	+ end
134	137
135	138	self.st_diffs = new_diffs
136	139	self.save
...	...