diff options
| author | Mark Chao <mchao@gitlab.com> | 2018-05-18 17:02:35 +0800 |
|---|---|---|
| committer | Mark Chao <mchao@gitlab.com> | 2018-05-18 17:02:35 +0800 |
| commit | b1ab1609b66f6cb47bb7d7b3babdd29cd0aae3c4 (patch) | |
| tree | 01d1d7b3ccdf90c80dfab1d1f4b92292c190fa67 /app/models/merge_request.rb | |
| parent | a660f548966bc8232cb56c4e344b0da3c91b3701 (diff) | |
| download | gitlab-ce-b1ab1609b66f6cb47bb7d7b3babdd29cd0aae3c4.tar.gz | |
Avoid race condition of re-triggering mark_as_unchecked
Diffstat (limited to 'app/models/merge_request.rb')
| -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 a0ad7f3c609..9c4384a6e42 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -104,8 +104,8 @@ class MergeRequest < ActiveRecord::Base state_machine :merge_status, initial: :unchecked do event :mark_as_unchecked do - transition [:can_be_merged] => :unchecked - transition [:cannot_be_merged] => :cannot_be_merged_recheck + transition [:can_be_merged, :unchecked] => :unchecked + transition [:cannot_be_merged, :cannot_be_merged_recheck] => :cannot_be_merged_recheck end event :mark_as_mergeable do |