Add latest changes from gitlab-org/gitlab@master

app/finders/merge_requests_finder.rb

@@ -101,3 +101,5 @@ class MergeRequestsFinder < IssuableFinder
         .or(table[:title].matches('[WIP]%'))
   end
 end
+
+MergeRequestsFinder.prepend_if_ee('EE::MergeRequestsFinder')

app/finders/notes_finder.rb

@@ -171,3 +171,5 @@ class NotesFinder
     @params[:notes_filter].present?
   end
 end
+
+NotesFinder.prepend_if_ee('EE::NotesFinder')

app/finders/projects_finder.rb

@@ -24,6 +24,8 @@
 class ProjectsFinder < UnionFinder
   include CustomAttributesFilter
+  prepend_if_ee('::EE::ProjectsFinder') # rubocop: disable Cop/InjectEnterpriseEditionModule
+
   attr_accessor :params
   attr_reader :current_user, :project_ids_relation

app/finders/template_finder.rb

@@ -3,6 +3,8 @@
 class TemplateFinder
   include Gitlab::Utils::StrongMemoize
+  prepend_if_ee('::EE::TemplateFinder') # rubocop: disable Cop/InjectEnterpriseEditionModule
+
   VENDORED_TEMPLATES = HashWithIndifferentAccess.new(
     dockerfiles: ::Gitlab::Template::DockerfileTemplate,
     gitignores: ::Gitlab::Template::GitignoreTemplate,

app/finders/users_finder.rb

@@ -95,3 +95,5 @@ class UsersFinder
     end
   end
 end
+
+UsersFinder.prepend_if_ee('EE::UsersFinder')

app/graphql/resolvers/echo_resolver.rb

@@ -2,7 +2,7 @@
 module Resolvers
   class EchoResolver < BaseResolver
-    argument    :text, GraphQL::STRING_TYPE, required: true
+    argument    :text, GraphQL::STRING_TYPE, required: true # rubocop:disable Graphql/Descriptions
     description 'Testing endpoint to validate the API with'
     def resolve(**args)

app/graphql/resolvers/issues_resolver.rb

@@ -33,9 +33,9 @@ module Resolvers
     argument :closed_after, Types::TimeType,
               required: false,
               description: "Issues closed after this date"
-    argument :search, GraphQL::STRING_TYPE,
+    argument :search, GraphQL::STRING_TYPE, # rubocop:disable Graphql/Descriptions
               required: false
-    argument :sort, Types::Sort,
+    argument :sort, Types::Sort, # rubocop:disable Graphql/Descriptions
               required: false,
               default_value: 'created_desc'

app/graphql/types/ci/detailed_status_type.rb

@@ -6,14 +6,14 @@ module Types
     class DetailedStatusType < BaseObject
       graphql_name 'DetailedStatus'
-      field :group, GraphQL::STRING_TYPE, null: false
-      field :icon, GraphQL::STRING_TYPE, null: false
-      field :favicon, GraphQL::STRING_TYPE, null: false
-      field :details_path, GraphQL::STRING_TYPE, null: false
-      field :has_details, GraphQL::BOOLEAN_TYPE, null: false, method: :has_details?
-      field :label, GraphQL::STRING_TYPE, null: false
-      field :text, GraphQL::STRING_TYPE, null: false
-      field :tooltip, GraphQL::STRING_TYPE, null: false, method: :status_tooltip
+      field :group, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+      field :icon, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+      field :favicon, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+      field :details_path, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+      field :has_details, GraphQL::BOOLEAN_TYPE, null: false, method: :has_details? # rubocop:disable Graphql/Descriptions
+      field :label, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+      field :text, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+      field :tooltip, GraphQL::STRING_TYPE, null: false, method: :status_tooltip # rubocop:disable Graphql/Descriptions
     end
     # rubocop: enable Graphql/AuthorizeTypes
   end

app/graphql/types/ci/pipeline_type.rb

@@ -9,13 +9,13 @@ module Types
       expose_permissions Types::PermissionTypes::Ci::Pipeline
-      field :id, GraphQL::ID_TYPE, null: false
-      field :iid, GraphQL::STRING_TYPE, null: false
-      field :sha, GraphQL::STRING_TYPE, null: false
-      field :before_sha, GraphQL::STRING_TYPE, null: true
-      field :status, PipelineStatusEnum, null: false
-      field :detailed_status,
+      field :id, GraphQL::ID_TYPE, null: false # rubocop:disable Graphql/Descriptions
+      field :iid, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+      field :sha, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+      field :before_sha, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
+      field :status, PipelineStatusEnum, null: false # rubocop:disable Graphql/Descriptions
+      field :detailed_status, # rubocop:disable Graphql/Descriptions
             Types::Ci::DetailedStatusType,
             null: false,
             resolve: -> (obj, _args, ctx) { obj.detailed_status(ctx[:current_user]) }
@@ -27,11 +27,11 @@ module Types
             GraphQL::FLOAT_TYPE,
             null: true,
             description: "Coverage percentage"
-      field :created_at, Types::TimeType, null: false
-      field :updated_at, Types::TimeType, null: false
-      field :started_at, Types::TimeType, null: true
-      field :finished_at, Types::TimeType, null: true
-      field :committed_at, Types::TimeType, null: true
+      field :created_at, Types::TimeType, null: false # rubocop:disable Graphql/Descriptions
+      field :updated_at, Types::TimeType, null: false # rubocop:disable Graphql/Descriptions
+      field :started_at, Types::TimeType, null: true # rubocop:disable Graphql/Descriptions
+      field :finished_at, Types::TimeType, null: true # rubocop:disable Graphql/Descriptions
+      field :committed_at, Types::TimeType, null: true # rubocop:disable Graphql/Descriptions
       # TODO: Add triggering user as a type
     end

app/graphql/types/commit_type.rb

@@ -8,16 +8,16 @@ module Types
     present_using CommitPresenter
-    field :id, type: GraphQL::ID_TYPE, null: false
-    field :sha, type: GraphQL::STRING_TYPE, null: false
-    field :title, type: GraphQL::STRING_TYPE, null: true
-    field :description, type: GraphQL::STRING_TYPE, null: true
-    field :message, type: GraphQL::STRING_TYPE, null: true
-    field :authored_date, type: Types::TimeType, null: true
-    field :web_url, type: GraphQL::STRING_TYPE, null: false
+    field :id, type: GraphQL::ID_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :sha, type: GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :title, type: GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :description, type: GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :message, type: GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :authored_date, type: Types::TimeType, null: true # rubocop:disable Graphql/Descriptions
+    field :web_url, type: GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
     # models/commit lazy loads the author by email
-    field :author, type: Types::UserType, null: true
+    field :author, type: Types::UserType, null: true # rubocop:disable Graphql/Descriptions
     field :latest_pipeline,
           type: Types::Ci::PipelineType,

app/graphql/types/group_type.rb

@@ -8,14 +8,16 @@ module Types
     expose_permissions Types::PermissionTypes::Group
-    field :web_url, GraphQL::STRING_TYPE, null: false
-    field :avatar_url, GraphQL::STRING_TYPE, null: true, resolve: -> (group, args, ctx) do
+    field :web_url, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :avatar_url, GraphQL::STRING_TYPE, null: true, resolve: -> (group, args, ctx) do # rubocop:disable Graphql/Descriptions
       group.avatar_url(only_path: false)
     end
-    field :parent, GroupType,
+    field :parent, GroupType, # rubocop:disable Graphql/Descriptions
           null: true,
           resolve: -> (obj, _args, _ctx) { Gitlab::Graphql::Loaders::BatchModelLoader.new(Group, obj.parent_id).find }
   end
 end
+
+Types::GroupType.prepend_if_ee('EE::Types::GroupType')

app/graphql/types/issue_type.rb

@@ -12,48 +12,50 @@ module Types
     present_using IssuePresenter
-    field :iid, GraphQL::ID_TYPE, null: false
-    field :title, GraphQL::STRING_TYPE, null: false
+    field :iid, GraphQL::ID_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :title, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
     markdown_field :title_html, null: true
-    field :description, GraphQL::STRING_TYPE, null: true
+    field :description, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
     markdown_field :description_html, null: true
-    field :state, IssueStateEnum, null: false
-    field :reference, GraphQL::STRING_TYPE, null: false, method: :to_reference do
-      argument :full, GraphQL::BOOLEAN_TYPE, required: false, default_value: false
+    field :state, IssueStateEnum, null: false # rubocop:disable Graphql/Descriptions
+    field :reference, GraphQL::STRING_TYPE, null: false, method: :to_reference do # rubocop:disable Graphql/Descriptions
+      argument :full, GraphQL::BOOLEAN_TYPE, required: false, default_value: false # rubocop:disable Graphql/Descriptions
     end
-    field :author, Types::UserType,
+    field :author, Types::UserType, # rubocop:disable Graphql/Descriptions
           null: false,
           resolve: -> (obj, _args, _ctx) { Gitlab::Graphql::Loaders::BatchModelLoader.new(User, obj.author_id).find }
     # Remove complexity when BatchLoader is used
-    field :assignees, Types::UserType.connection_type, null: true, complexity: 5
+    field :assignees, Types::UserType.connection_type, null: true, complexity: 5 # rubocop:disable Graphql/Descriptions
     # Remove complexity when BatchLoader is used
-    field :labels, Types::LabelType.connection_type, null: true, complexity: 5
-    field :milestone, Types::MilestoneType,
+    field :labels, Types::LabelType.connection_type, null: true, complexity: 5 # rubocop:disable Graphql/Descriptions
+    field :milestone, Types::MilestoneType, # rubocop:disable Graphql/Descriptions
           null: true,
           resolve: -> (obj, _args, _ctx) { Gitlab::Graphql::Loaders::BatchModelLoader.new(Milestone, obj.milestone_id).find }
-    field :due_date, Types::TimeType, null: true
-    field :confidential, GraphQL::BOOLEAN_TYPE, null: false
-    field :discussion_locked, GraphQL::BOOLEAN_TYPE,
+    field :due_date, Types::TimeType, null: true # rubocop:disable Graphql/Descriptions
+    field :confidential, GraphQL::BOOLEAN_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :discussion_locked, GraphQL::BOOLEAN_TYPE, # rubocop:disable Graphql/Descriptions
           null: false,
           resolve: -> (obj, _args, _ctx) { !!obj.discussion_locked }
-    field :upvotes, GraphQL::INT_TYPE, null: false
-    field :downvotes, GraphQL::INT_TYPE, null: false
-    field :user_notes_count, GraphQL::INT_TYPE, null: false
-    field :web_path, GraphQL::STRING_TYPE, null: false, method: :issue_path
-    field :web_url, GraphQL::STRING_TYPE, null: false
-    field :relative_position, GraphQL::INT_TYPE, null: true
-    field :closed_at, Types::TimeType, null: true
-    field :created_at, Types::TimeType, null: false
-    field :updated_at, Types::TimeType, null: false
-    field :task_completion_status, Types::TaskCompletionStatus, null: false
+    field :upvotes, GraphQL::INT_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :downvotes, GraphQL::INT_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :user_notes_count, GraphQL::INT_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :web_path, GraphQL::STRING_TYPE, null: false, method: :issue_path # rubocop:disable Graphql/Descriptions
+    field :web_url, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :relative_position, GraphQL::INT_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :closed_at, Types::TimeType, null: true # rubocop:disable Graphql/Descriptions
+    field :created_at, Types::TimeType, null: false # rubocop:disable Graphql/Descriptions
+    field :updated_at, Types::TimeType, null: false # rubocop:disable Graphql/Descriptions
+    field :task_completion_status, Types::TaskCompletionStatus, null: false # rubocop:disable Graphql/Descriptions
   end
 end
+
+Types::IssueType.prepend_if_ee('::EE::Types::IssueType')

app/graphql/types/label_type.rb

@@ -6,10 +6,10 @@ module Types
     authorize :read_label
-    field :description, GraphQL::STRING_TYPE, null: true
+    field :description, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
     markdown_field :description_html, null: true
-    field :title, GraphQL::STRING_TYPE, null: false
-    field :color, GraphQL::STRING_TYPE, null: false
-    field :text_color, GraphQL::STRING_TYPE, null: false
+    field :title, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :color, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :text_color, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
   end
 end

app/graphql/types/merge_request_type.rb

@@ -12,53 +12,55 @@ module Types
     present_using MergeRequestPresenter
-    field :id, GraphQL::ID_TYPE, null: false
-    field :iid, GraphQL::STRING_TYPE, null: false
-    field :title, GraphQL::STRING_TYPE, null: false
+    field :id, GraphQL::ID_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :iid, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :title, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
     markdown_field :title_html, null: true
-    field :description, GraphQL::STRING_TYPE, null: true
+    field :description, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
     markdown_field :description_html, null: true
-    field :state, MergeRequestStateEnum, null: false
-    field :created_at, Types::TimeType, null: false
-    field :updated_at, Types::TimeType, null: false
-    field :source_project, Types::ProjectType, null: true
-    field :target_project, Types::ProjectType, null: false
-    field :diff_refs, Types::DiffRefsType, null: true
+    field :state, MergeRequestStateEnum, null: false # rubocop:disable Graphql/Descriptions
+    field :created_at, Types::TimeType, null: false # rubocop:disable Graphql/Descriptions
+    field :updated_at, Types::TimeType, null: false # rubocop:disable Graphql/Descriptions
+    field :source_project, Types::ProjectType, null: true # rubocop:disable Graphql/Descriptions
+    field :target_project, Types::ProjectType, null: false # rubocop:disable Graphql/Descriptions
+    field :diff_refs, Types::DiffRefsType, null: true # rubocop:disable Graphql/Descriptions
     # Alias for target_project
-    field :project, Types::ProjectType, null: false
-    field :project_id, GraphQL::INT_TYPE, null: false, method: :target_project_id
-    field :source_project_id, GraphQL::INT_TYPE, null: true
-    field :target_project_id, GraphQL::INT_TYPE, null: false
-    field :source_branch, GraphQL::STRING_TYPE, null: false
-    field :target_branch, GraphQL::STRING_TYPE, null: false
-    field :work_in_progress, GraphQL::BOOLEAN_TYPE, method: :work_in_progress?, null: false
-    field :merge_when_pipeline_succeeds, GraphQL::BOOLEAN_TYPE, null: true
-    field :diff_head_sha, GraphQL::STRING_TYPE, null: true
-    field :merge_commit_sha, GraphQL::STRING_TYPE, null: true
-    field :user_notes_count, GraphQL::INT_TYPE, null: true
-    field :should_remove_source_branch, GraphQL::BOOLEAN_TYPE, method: :should_remove_source_branch?, null: true
-    field :force_remove_source_branch, GraphQL::BOOLEAN_TYPE, method: :force_remove_source_branch?, null: true
-    field :merge_status, GraphQL::STRING_TYPE, null: true
-    field :in_progress_merge_commit_sha, GraphQL::STRING_TYPE, null: true
-    field :merge_error, GraphQL::STRING_TYPE, null: true
-    field :allow_collaboration, GraphQL::BOOLEAN_TYPE, null: true
-    field :should_be_rebased, GraphQL::BOOLEAN_TYPE, method: :should_be_rebased?, null: false
-    field :rebase_commit_sha, GraphQL::STRING_TYPE, null: true
-    field :rebase_in_progress, GraphQL::BOOLEAN_TYPE, method: :rebase_in_progress?, null: false, calls_gitaly: true
+    field :project, Types::ProjectType, null: false # rubocop:disable Graphql/Descriptions
+    field :project_id, GraphQL::INT_TYPE, null: false, method: :target_project_id # rubocop:disable Graphql/Descriptions
+    field :source_project_id, GraphQL::INT_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :target_project_id, GraphQL::INT_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :source_branch, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :target_branch, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :work_in_progress, GraphQL::BOOLEAN_TYPE, method: :work_in_progress?, null: false # rubocop:disable Graphql/Descriptions
+    field :merge_when_pipeline_succeeds, GraphQL::BOOLEAN_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :diff_head_sha, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :merge_commit_sha, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :user_notes_count, GraphQL::INT_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :should_remove_source_branch, GraphQL::BOOLEAN_TYPE, method: :should_remove_source_branch?, null: true # rubocop:disable Graphql/Descriptions
+    field :force_remove_source_branch, GraphQL::BOOLEAN_TYPE, method: :force_remove_source_branch?, null: true # rubocop:disable Graphql/Descriptions
+    field :merge_status, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :in_progress_merge_commit_sha, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :merge_error, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :allow_collaboration, GraphQL::BOOLEAN_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :should_be_rebased, GraphQL::BOOLEAN_TYPE, method: :should_be_rebased?, null: false # rubocop:disable Graphql/Descriptions
+    field :rebase_commit_sha, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :rebase_in_progress, GraphQL::BOOLEAN_TYPE, method: :rebase_in_progress?, null: false, calls_gitaly: true # rubocop:disable Graphql/Descriptions
+    # rubocop:disable Graphql/Descriptions
     field :merge_commit_message, GraphQL::STRING_TYPE, method: :default_merge_commit_message, null: true, deprecation_reason: "Renamed to defaultMergeCommitMessage"
-    field :default_merge_commit_message, GraphQL::STRING_TYPE, null: true
-    field :merge_ongoing, GraphQL::BOOLEAN_TYPE, method: :merge_ongoing?, null: false
-    field :source_branch_exists, GraphQL::BOOLEAN_TYPE, method: :source_branch_exists?, null: false
-    field :mergeable_discussions_state, GraphQL::BOOLEAN_TYPE, null: true
-    field :web_url, GraphQL::STRING_TYPE, null: true
-    field :upvotes, GraphQL::INT_TYPE, null: false
-    field :downvotes, GraphQL::INT_TYPE, null: false
-    field :subscribed, GraphQL::BOOLEAN_TYPE, method: :subscribed?, null: false
-    field :head_pipeline, Types::Ci::PipelineType, null: true, method: :actual_head_pipeline
-    field :pipelines, Types::Ci::PipelineType.connection_type,
+    # rubocop:enable Graphql/Descriptions
+    field :default_merge_commit_message, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :merge_ongoing, GraphQL::BOOLEAN_TYPE, method: :merge_ongoing?, null: false # rubocop:disable Graphql/Descriptions
+    field :source_branch_exists, GraphQL::BOOLEAN_TYPE, method: :source_branch_exists?, null: false # rubocop:disable Graphql/Descriptions
+    field :mergeable_discussions_state, GraphQL::BOOLEAN_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :web_url, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :upvotes, GraphQL::INT_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :downvotes, GraphQL::INT_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :subscribed, GraphQL::BOOLEAN_TYPE, method: :subscribed?, null: false # rubocop:disable Graphql/Descriptions
+    field :head_pipeline, Types::Ci::PipelineType, null: true, method: :actual_head_pipeline # rubocop:disable Graphql/Descriptions
+    field :pipelines, Types::Ci::PipelineType.connection_type, # rubocop:disable Graphql/Descriptions
           resolver: Resolvers::MergeRequestPipelinesResolver
-    field :task_completion_status, Types::TaskCompletionStatus, null: false
+    field :task_completion_status, Types::TaskCompletionStatus, null: false # rubocop:disable Graphql/Descriptions
   end
 end

app/graphql/types/metadata_type.rb

@@ -6,7 +6,7 @@ module Types
     authorize :read_instance_metadata
-    field :version, GraphQL::STRING_TYPE, null: false
-    field :revision, GraphQL::STRING_TYPE, null: false
+    field :version, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :revision, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
   end
 end

app/graphql/types/milestone_type.rb

@@ -6,14 +6,14 @@ module Types
     authorize :read_milestone
-    field :description, GraphQL::STRING_TYPE, null: true
-    field :title, GraphQL::STRING_TYPE, null: false
-    field :state, GraphQL::STRING_TYPE, null: false
-    field :due_date, Types::TimeType, null: true
-    field :start_date, Types::TimeType, null: true
-    field :created_at, Types::TimeType, null: false
-    field :updated_at, Types::TimeType, null: false
+    field :description, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :title, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :state, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :due_date, Types::TimeType, null: true # rubocop:disable Graphql/Descriptions
+    field :start_date, Types::TimeType, null: true # rubocop:disable Graphql/Descriptions
+    field :created_at, Types::TimeType, null: false # rubocop:disable Graphql/Descriptions
+    field :updated_at, Types::TimeType, null: false # rubocop:disable Graphql/Descriptions
   end
 end

app/graphql/types/mutation_type.rb

@@ -17,3 +17,5 @@ module Types
     mount_mutation Mutations::Notes::Destroy
   end
 end
+
+::Types::MutationType.prepend_if_ee('::EE::Types::MutationType')

app/graphql/types/namespace_type.rb

@@ -6,25 +6,25 @@ module Types
     authorize :read_namespace
-    field :id, GraphQL::ID_TYPE, null: false
-    field :name, GraphQL::STRING_TYPE, null: false
-    field :path, GraphQL::STRING_TYPE, null: false
-    field :full_name, GraphQL::STRING_TYPE, null: false
-    field :full_path, GraphQL::ID_TYPE, null: false
-    field :description, GraphQL::STRING_TYPE, null: true
+    field :id, GraphQL::ID_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :name, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :path, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :full_name, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :full_path, GraphQL::ID_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :description, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
     markdown_field :description_html, null: true
-    field :visibility, GraphQL::STRING_TYPE, null: true
-    field :lfs_enabled, GraphQL::BOOLEAN_TYPE, null: true, method: :lfs_enabled?
-    field :request_access_enabled, GraphQL::BOOLEAN_TYPE, null: true
+    field :visibility, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :lfs_enabled, GraphQL::BOOLEAN_TYPE, null: true, method: :lfs_enabled? # rubocop:disable Graphql/Descriptions
+    field :request_access_enabled, GraphQL::BOOLEAN_TYPE, null: true # rubocop:disable Graphql/Descriptions
     field :root_storage_statistics, Types::RootStorageStatisticsType,
           null: true,
           description: 'The aggregated storage statistics. Only available for root namespaces',
           resolve: -> (obj, _args, _ctx) { Gitlab::Graphql::Loaders::BatchRootStorageStatisticsLoader.new(obj.id).find }
-    field :projects,
+    field :projects, # rubocop:disable Graphql/Descriptions
           Types::ProjectType.connection_type,
           null: false,
           resolver: ::Resolvers::NamespaceProjectsResolver

app/graphql/types/notes/diff_position_type.rb

@@ -7,7 +7,7 @@ module Types
     class DiffPositionType < BaseObject
       graphql_name 'DiffPosition'
-      field :diff_refs, Types::DiffRefsType, null: false
+      field :diff_refs, Types::DiffRefsType, null: false # rubocop:disable Graphql/Descriptions
       field :file_path, GraphQL::STRING_TYPE, null: false,
             description: "The path of the file that was changed"
@@ -15,7 +15,7 @@ module Types
             description: "The path of the file on the start sha."
       field :new_path, GraphQL::STRING_TYPE, null: true,
             description: "The path of the file on the head sha."
-      field :position_type, Types::Notes::PositionTypeEnum, null: false
+      field :position_type, Types::Notes::PositionTypeEnum, null: false # rubocop:disable Graphql/Descriptions
       # Fields for text positions
       field :old_line, GraphQL::INT_TYPE, null: true,

app/graphql/types/notes/discussion_type.rb

@@ -7,9 +7,9 @@ module Types
       authorize :read_note
-      field :id, GraphQL::ID_TYPE, null: false
+      field :id, GraphQL::ID_TYPE, null: false # rubocop:disable Graphql/Descriptions
       field :reply_id, GraphQL::ID_TYPE, null: false, description: 'The ID used to reply to this discussion'
-      field :created_at, Types::TimeType, null: false
+      field :created_at, Types::TimeType, null: false # rubocop:disable Graphql/Descriptions
       field :notes, Types::Notes::NoteType.connection_type, null: false, description: "All notes in the discussion"
       # The gem we use to generate Global IDs is hard-coded to work with