Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 2 insertions, 14 deletions

diff --git a/app/graphql/types/merge_requests/reviewer_type.rb b/app/graphql/types/merge_requests/reviewer_type.rb
index 09ced39844a..1ced821c839 100644
--- a/app/graphql/types/merge_requests/reviewer_type.rb
+++ b/app/graphql/types/merge_requests/reviewer_type.rb
@@ -4,23 +4,11 @@ module Types
   module MergeRequests
     class ReviewerType < ::Types::UserType
       include FindClosest
+      include ::Types::MergeRequests::InteractsWithMergeRequest
 
       graphql_name 'MergeRequestReviewer'
-      description 'A user from whom a merge request review has been requested.'
+      description 'A user assigned to a merge request as a reviewer.'
       authorize :read_user
-
-      field :merge_request_interaction,
-            type: ::Types::UserMergeRequestInteractionType,
-            null: true,
-            extras: [:parent],
-            description: "Details of this user's interactions with the merge request."
-
-      def merge_request_interaction(parent:)
-        merge_request = closest_parent(::Types::MergeRequestType, parent)
-        return unless merge_request
-
-        Users::MergeRequestInteraction.new(user: object, merge_request: merge_request)
-      end
     end
   end
 end