reset st_commits before setting new value to prevent error when old st_commits is broken

Dmitriy Zaporozhets
1 parent d3559e25
Showing 1 changed file with 6 additions and 0 deletions Show diff stats
app/models/merge_request.rb
@@ -172,6 +172,12 @@ class MergeRequest &lt; ActiveRecord::Base
   def reloaded_commits
     if opened? && unmerged_commits.any?
+      # we need to reset st_commits field first
+      # in order to prevent internal rails comparison
+      self.st_commits = []
+      save
+
+      # Then we can safely write unmerged commits
       self.st_commits = unmerged_commits
       save
     end
	@@ -172,6 +172,12 @@ class MergeRequest < ActiveRecord::Base		@@ -172,6 +172,12 @@ class MergeRequest < ActiveRecord::Base
172		172
173	def reloaded_commits	173	def reloaded_commits
174	if opened? && unmerged_commits.any?	174	if opened? && unmerged_commits.any?
		175	+ # we need to reset st_commits field first
		176	+ # in order to prevent internal rails comparison
		177	+ self.st_commits = []
		178	+ save
		179	+
		180	+ # Then we can safely write unmerged commits
175	self.st_commits = unmerged_commits	181	self.st_commits = unmerged_commits
176	save	182	save
177	end	183	end