diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-20 13:16:51 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-20 13:16:51 -0700 |
| commit | baaa56029001000b3b57022f7e1de7b89cce7f6f (patch) | |
| tree | 9d23d51ed15179718aebb969c9976c738fa507cf | |
| parent | 1f711fd93d9e8f9955d59946469df2b6c7aa9c42 (diff) | |
| parent | 65b392c3941885f01ff7375fdced8ece7f28d02b (diff) | |
| download | gitlab-ce-baaa56029001000b3b57022f7e1de7b89cce7f6f.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
| -rw-r--r-- | app/models/merge_request.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 4cbdc612297..798306f6dcc 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -95,11 +95,11 @@ class MergeRequest < ActiveRecord::Base end event :mark_as_mergeable do - transition unchecked: :can_be_merged + transition [:unchecked, :cannot_be_merged] => :can_be_merged end event :mark_as_unmergeable do - transition unchecked: :cannot_be_merged + transition [:unchecked, :can_be_merged] => :cannot_be_merged end state :unchecked |