diff options
| author | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-10-20 15:27:34 +0200 |
|---|---|---|
| committer | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-10-20 15:27:34 +0200 |
| commit | d4e3664067f330c7d070ee6c92b794cb50ff2d76 (patch) | |
| tree | 12954f5387748f6e590b917a55058aff63cbc059 /app/models/merge_request.rb | |
| parent | 122769e358287c32777092f66eec2b67a501c386 (diff) | |
| download | gitlab-ce-d4e3664067f330c7d070ee6c92b794cb50ff2d76.tar.gz | |
Fix bug in MergeRequest#mark_as_unmergable
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index b17f689c54e..70780b75d45 100644 --- 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 |