Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-11-03 09:10:20 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-11-03 09:10:20 +0300
commit14c866bb2ff6550420257cee619828a7510433dc (patch)
tree9294ef04be6e72dbc92581ddd470c4345570227b /app/models/concerns/merge_request_reviewer_state.rb
parent6f0447dba04ade76f8ea5fba59bbb48625afb9b6 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/merge_request_reviewer_state.rb')
-rw-r--r--app/models/concerns/merge_request_reviewer_state.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/models/concerns/merge_request_reviewer_state.rb b/app/models/concerns/merge_request_reviewer_state.rb
index b73a601bdb0..ba3c55adf64 100644
--- a/app/models/concerns/merge_request_reviewer_state.rb
+++ b/app/models/concerns/merge_request_reviewer_state.rb
@@ -13,5 +13,13 @@ module MergeRequestReviewerState
validates :state,
presence: true,
inclusion: { in: self.states.keys }
+
+ after_initialize :set_state, unless: :persisted?
+
+ def set_state
+ if Feature.enabled?(:mr_attention_requests, self.merge_request&.project, default_enabled: :yaml)
+ self.state = :attention_required
+ end
+ end
end
end