diff options
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 8028ff3875b..4addf42325d 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -56,6 +56,7 @@ class MergeRequest < ActiveRecord::Base after_create :ensure_merge_request_diff, unless: :importing? after_update :clear_memoized_shas after_update :reload_diff_if_branch_changed + after_update :mark_as_unchecked_if_target_branch_changed # When this attribute is true some MR validation is ignored # It allows us to close or modify broken merge requests @@ -561,6 +562,12 @@ class MergeRequest < ActiveRecord::Base end end + def mark_as_unchecked_if_target_branch_changed + return unless target_branch_changed? + + mark_as_unchecked + end + def reload_diff(current_user = nil) return unless open? |