diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-06 00:09:10 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-06 00:09:10 +0300 |
commit | a29707687893beecb0e333a12e6f9e093a77eeb9 (patch) | |
tree | 8d89e554f4d8318a228f9d4717d2a9f75fc10651 /app/models/merge_request_assignee.rb | |
parent | 0b789f95a35aa3e4b99ce12fc98bd3cce6555602 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/merge_request_assignee.rb')
-rw-r--r-- | app/models/merge_request_assignee.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/app/models/merge_request_assignee.rb b/app/models/merge_request_assignee.rb index 77b46fa50f4..fd8e5860040 100644 --- a/app/models/merge_request_assignee.rb +++ b/app/models/merge_request_assignee.rb @@ -10,12 +10,6 @@ class MergeRequestAssignee < ApplicationRecord scope :in_projects, ->(project_ids) { joins(:merge_request).where(merge_requests: { target_project_id: project_ids }) } - def set_state - if Feature.enabled?(:mr_attention_requests, self.merge_request&.project, default_enabled: :yaml) - self.state = MergeRequestReviewer.find_by(user_id: self.user_id, merge_request_id: self.merge_request_id)&.state || :attention_requested - end - end - def cache_key [model_name.cache_key, id, state, assignee.cache_key] end |