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:
Diffstat (limited to 'app/models/merge_request_assignee.rb')
-rw-r--r--app/models/merge_request_assignee.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/merge_request_assignee.rb b/app/models/merge_request_assignee.rb
index fd8e5860040..be3a1d42eac 100644
--- a/app/models/merge_request_assignee.rb
+++ b/app/models/merge_request_assignee.rb
@@ -1,7 +1,8 @@
# frozen_string_literal: true
class MergeRequestAssignee < ApplicationRecord
- include MergeRequestReviewerState
+ include IgnorableColumns
+ ignore_column %i[state updated_state_by_user_id], remove_with: '15.6', remove_after: '2022-10-22'
belongs_to :merge_request, touch: true
belongs_to :assignee, class_name: "User", foreign_key: :user_id, inverse_of: :merge_request_assignees
@@ -11,6 +12,6 @@ class MergeRequestAssignee < ApplicationRecord
scope :in_projects, ->(project_ids) { joins(:merge_request).where(merge_requests: { target_project_id: project_ids }) }
def cache_key
- [model_name.cache_key, id, state, assignee.cache_key]
+ [model_name.cache_key, id, assignee.cache_key]
end
end