Avoid race condition of re-triggering mark_as_unchecked

b1ab1609 · Mark Chao · a660f548 · b1ab1609
Commit b1ab1609 authored May 18, 2018 by Mark Chao
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/models/merge_request.rb app/models/merge_request.rb +2 -2

No files found.
--- 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