From b1ab1609b66f6cb47bb7d7b3babdd29cd0aae3c4 Mon Sep 17 00:00:00 2001 From: Mark Chao Date: Fri, 18 May 2018 17:02:35 +0800 Subject: [PATCH] Avoid race condition of re-triggering mark_as_unchecked --- app/models/merge_request.rb | 4 ++-- 1 file 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 -- GitLab