Fix bug in MergeRequest#mark_as_unmergable

This commit is contained in:
Riyad Preukschas
2012-10-20 15:27:34 +02:00
parent 122769e358
commit d4e3664067
+2 -1
View File
@@ -135,7 +135,8 @@ class MergeRequest < 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