From a29707687893beecb0e333a12e6f9e093a77eeb9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 5 May 2022 21:09:10 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/models/merge_request_assignee.rb | 6 ------ 1 file changed, 6 deletions(-) (limited to 'app/models/merge_request_assignee.rb') 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 -- cgit v1.2.3