Fix bug in MergeRequest#mark_as_unmergable

d4e36640 · Riyad Preukschas · 122769e3 · d4e36640
Commit d4e36640 authored Oct 20, 2012 by Riyad Preukschas
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

app/models/merge_request.rb app/models/merge_request.rb +2 -1

No files found.
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -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