Commit f145450415ed1e9db10ebcb8e02eb15c6dcffbf1
1 parent
90748cf7
Exists in
master
and in
4 other branches
fixed mr unmergable method
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
app/models/merge_request.rb
@@ -144,7 +144,7 @@ class MergeRequest < ActiveRecord::Base | @@ -144,7 +144,7 @@ class MergeRequest < ActiveRecord::Base | ||
144 | end | 144 | end |
145 | 145 | ||
146 | def mark_as_unmergable | 146 | def mark_as_unmergable |
147 | - # TODO: write some code here | 147 | + self.update_attributes :state => CANNOT_BE_MERGED |
148 | end | 148 | end |
149 | 149 | ||
150 | def reloaded_commits | 150 | def reloaded_commits |