From f145450415ed1e9db10ebcb8e02eb15c6dcffbf1 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sat, 31 Mar 2012 13:48:30 +0300 Subject: [PATCH] fixed mr unmergable method --- app/models/merge_request.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index d7863c2e..3845a0ec 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