Add latest changes from gitlab-org/gitlab@master

6 files changed, 31 insertions, 6 deletions

diff --git a/app/graphql/types/merge_request_type.rb b/app/graphql/types/merge_request_type.rb
index 95b7438460d..af198d03c3f 100644
--- a/app/graphql/types/merge_request_type.rb
+++ b/app/graphql/types/merge_request_type.rb
@@ -137,7 +137,7 @@ module Types
           null: true,
           complexity: 5,
           description: 'Assignees of the merge request.'
-    field :author, Types::UserType, null: true,
+    field :author, Types::MergeRequests::AuthorType, null: true,
           description: 'User who created this merge request.'
     field :discussion_locked, GraphQL::Types::Boolean,
           description: 'Indicates if comments on the merge request are locked to members only.',
@@ -150,7 +150,7 @@ module Types
           description: 'Labels of the merge request.'
     field :milestone, Types::MilestoneType, null: true,
           description: 'Milestone of the merge request.'
-    field :participants, Types::UserType.connection_type, null: true, complexity: 15,
+    field :participants, Types::MergeRequests::ParticipantType.connection_type, null: true, complexity: 15,
           description: 'Participants in the merge request. This includes the author, assignees, reviewers, and users mentioned in notes.',
           resolver: Resolvers::Users::ParticipantsResolver
     field :reference, GraphQL::Types::String, null: false, method: :to_reference,
diff --git a/app/graphql/types/merge_requests/assignee_type.rb b/app/graphql/types/merge_requests/assignee_type.rb
index 24321d057a3..a0ba74597ba 100644
--- a/app/graphql/types/merge_requests/assignee_type.rb
+++ b/app/graphql/types/merge_requests/assignee_type.rb
@@ -6,7 +6,6 @@ module Types
       graphql_name 'MergeRequestAssignee'
       description 'A user assigned to a merge request.'
 
-      include FindClosest
       include ::Types::MergeRequests::InteractsWithMergeRequest
 
       authorize :read_user
diff --git a/app/graphql/types/merge_requests/author_type.rb b/app/graphql/types/merge_requests/author_type.rb
new file mode 100644
index 00000000000..56ad3190547
--- /dev/null
+++ b/app/graphql/types/merge_requests/author_type.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Types
+  module MergeRequests
+    class AuthorType < ::Types::UserType
+      graphql_name 'MergeRequestAuthor'
+      description 'The author of the merge request.'
+
+      include ::Types::MergeRequests::InteractsWithMergeRequest
+
+      authorize :read_user
+    end
+  end
+end
diff --git a/app/graphql/types/merge_requests/participant_type.rb b/app/graphql/types/merge_requests/participant_type.rb
new file mode 100644
index 00000000000..86d627097b2
--- /dev/null
+++ b/app/graphql/types/merge_requests/participant_type.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Types
+  module MergeRequests
+    class ParticipantType < ::Types::UserType
+      graphql_name 'MergeRequestParticipant'
+      description 'A user participating in a merge request.'
+
+      include ::Types::MergeRequests::InteractsWithMergeRequest
+
+      authorize :read_user
+    end
+  end
+end
diff --git a/app/graphql/types/merge_requests/reviewer_type.rb b/app/graphql/types/merge_requests/reviewer_type.rb
index 11f7ceaf461..e5bc5812816 100644
--- a/app/graphql/types/merge_requests/reviewer_type.rb
+++ b/app/graphql/types/merge_requests/reviewer_type.rb
@@ -6,7 +6,6 @@ module Types
       graphql_name 'MergeRequestReviewer'
       description 'A user assigned to a merge request as a reviewer.'
 
-      include FindClosest
       include ::Types::MergeRequests::InteractsWithMergeRequest
 
       authorize :read_user
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index de9497a2f40..803b9781ac4 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -316,7 +316,6 @@ class WikiPage
   end
 
   def update_front_matter(attrs)
-    return unless Gitlab::WikiPages::FrontMatterParser.enabled?(container)
     return unless attrs.has_key?(:front_matter)
 
     fm_yaml = serialize_front_matter(attrs[:front_matter])
@@ -327,7 +326,7 @@ class WikiPage
 
   def parsed_content
     strong_memoize(:parsed_content) do
-      Gitlab::WikiPages::FrontMatterParser.new(raw_content, container).parse
+      Gitlab::WikiPages::FrontMatterParser.new(raw_content).parse
     end
   end