diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-03-31 13:48:30 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-03-31 13:48:30 +0300 |
| commit | f145450415ed1e9db10ebcb8e02eb15c6dcffbf1 (patch) | |
| tree | 6fefe0de71cdbf0da5b50904baff9171e0007fa2 | |
| parent | 90748cf724d4b019c954d316621b04cefd69dbaf (diff) | |
| download | gitlab-ce-f145450415ed1e9db10ebcb8e02eb15c6dcffbf1.tar.gz | |
fixed mr unmergable method
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index d7863c2edb0..3845a0eced2 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -144,7 +144,7 @@ class MergeRequest < ActiveRecord::Base end def mark_as_unmergable - # TODO: write some code here + self.update_attributes :state => CANNOT_BE_MERGED end def reloaded_commits |