Fix bug in MergeRequest#mark_as_unmergable

Riyad Preukschas
1 parent 122769e3
Showing 1 changed file with 2 additions and 1 deletions Show diff stats
app/models/merge_request.rb
@@ -135,7 +135,8 @@ class MergeRequest &lt; ActiveRecord::Base
   end
  
   def mark_as_unmergable
-    self.update_attributes state: CANNOT_BE_MERGED
+    self.state = CANNOT_BE_MERGED
+    self.save
   end
  
   def reloaded_commits
...	...	@@ -135,7 +135,8 @@ class MergeRequest < ActiveRecord::Base
135	135	end
136	136
137	137	def mark_as_unmergable
138		- self.update_attributes state: CANNOT_BE_MERGED
	138	+ self.state = CANNOT_BE_MERGED
	139	+ self.save
139	140	end
140	141
141	142	def reloaded_commits
...	...