Add latest changes from gitlab-org/gitlab@master

25 files changed, 445 insertions, 259 deletions

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index dfc39d8e03b..a7d94281008 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -21,6 +21,27 @@ $spacing-scale: (
 );
 
 /*
+ * Why another sizing scale???
+ * Great question, friend!
+ * This size scale is a "backport" of the equivalent set of "named" sizes
+ * (e.g. `xl` versus `70`) that came from the following design document as of 2019-10-23:
+ *
+ * https://gitlab-org.gitlab.io/gitlab-design/hosted/design-gitlab-specs/forms-spec-previews/
+ *
+ * (See `input-` items at the bottom)
+ *
+ * The presumption here is that these sizes will be standardized in GitLab UI and thus will be
+ * broadly useful here in the GitLab product when not using the GitLab UI components.
+ */
+$size-scale: (
+  'xs': #{10 * $grid-size},
+  's': #{20 * $grid-size},
+  'm': #{30 * $grid-size},
+  'l': #{40 * $grid-size},
+  'xl': #{70 * $grid-size}
+);
+
+/*
  * Color schema
  */
 $darken-normal-factor: 7%;
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index b2c1d0b6dc5..3f8bdc82eff 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -252,6 +252,7 @@
 
     .fa-caret-down {
       margin-left: 3px;
+      line-height: 0;
 
       &.dropdown-btn-icon {
         margin-left: 0;
@@ -269,7 +270,7 @@
   }
 
   .count-badge,
-  .btn-xs {
+  .btn {
     height: 24px;
   }
 
diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss
index d2906ce0780..4a0b6ac1ddd 100644
--- a/app/assets/stylesheets/utilities.scss
+++ b/app/assets/stylesheets/utilities.scss
@@ -16,6 +16,12 @@
   }
 }
 
+@each $index, $size in $size-scale {
+  #{'.mw-#{$index}'} {
+    max-width: $size;
+  }
+}
+
 .border-width-1px { border-width: 1px; }
 .border-style-dashed { border-style: dashed; }
 .border-style-solid { border-style: solid; }
diff --git a/app/controllers/notification_settings_controller.rb b/app/controllers/notification_settings_controller.rb
index c97fec0a6ee..e5d4a4bb073 100644
--- a/app/controllers/notification_settings_controller.rb
+++ b/app/controllers/notification_settings_controller.rb
@@ -16,12 +16,7 @@ class NotificationSettingsController < ApplicationController
     @notification_setting = current_user.notification_settings.find(params[:id])
     @saved = @notification_setting.update(notification_setting_params_for(@notification_setting.source))
 
-    if params[:hide_label].present?
-      btn_class = params[:project_id].present? ? 'btn-xs' : ''
-      render_response("shared/notifications/_new_button", btn_class)
-    else
-      render_response
-    end
+    render_response
   end
 
   private
@@ -42,7 +37,16 @@ class NotificationSettingsController < ApplicationController
     can?(current_user, ability_name, resource)
   end
 
-  def render_response(response_template = "shared/notifications/_button", btn_class = nil)
+  def render_response
+    btn_class = nil
+
+    if params[:hide_label].present?
+      btn_class = 'btn-xs' if params[:project_id].present?
+      response_template = 'shared/notifications/_new_button'
+    else
+      response_template = 'shared/notifications/_button'
+    end
+
     render json: {
       html: view_to_html_string(response_template, notification_setting: @notification_setting, btn_class: btn_class),
       saved: @saved
diff --git a/app/graphql/types/commit_type.rb b/app/graphql/types/commit_type.rb
index fe71791f413..d5600881728 100644
--- a/app/graphql/types/commit_type.rb
+++ b/app/graphql/types/commit_type.rb
@@ -8,23 +8,31 @@ module Types
 
     present_using CommitPresenter
 
-    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
-    field :signature_html, type: GraphQL::STRING_TYPE,
-      null: true, calls_gitaly: true, description: 'Rendered html for the commit signature'
+    field :id, type: GraphQL::ID_TYPE, null: false,
+          description: 'ID (global ID) of the commit'
+    field :sha, type: GraphQL::STRING_TYPE, null: false,
+          description: 'SHA1 ID of the commit'
+    field :title, type: GraphQL::STRING_TYPE, null: true,
+          description: 'Title of the commit message'
+    field :description, type: GraphQL::STRING_TYPE, null: true,
+          description: 'Description of the commit message'
+    field :message, type: GraphQL::STRING_TYPE, null: true,
+          description: 'Raw commit message'
+    field :authored_date, type: Types::TimeType, null: true,
+          description: 'Timestamp of when the commit was authored'
+    field :web_url, type: GraphQL::STRING_TYPE, null: false,
+          description: 'Web URL of the commit'
+    field :signature_html, type: GraphQL::STRING_TYPE, null: true, calls_gitaly: true,
+          description: 'Rendered HTML of the commit signature'
 
     # models/commit lazy loads the author by email
-    field :author, type: Types::UserType, null: true # rubocop:disable Graphql/Descriptions
+    field :author, type: Types::UserType, null: true,
+          description: 'Author of the commit'
 
     field :latest_pipeline,
           type: Types::Ci::PipelineType,
           null: true,
-          description: "Latest pipeline for this commit",
+          description: "Latest pipeline of the commit",
           resolve: -> (obj, ctx, args) do
             Gitlab::Graphql::Loaders::PipelineForShaLoader.new(obj.project, obj.sha).find_last
           end
diff --git a/app/graphql/types/group_type.rb b/app/graphql/types/group_type.rb
index 1e52c0cb147..386ae6ed4a3 100644
--- a/app/graphql/types/group_type.rb
+++ b/app/graphql/types/group_type.rb
@@ -8,14 +8,17 @@ module Types
 
     expose_permissions Types::PermissionTypes::Group
 
-    field :web_url, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :web_url, GraphQL::STRING_TYPE, null: false,
+          description: 'Web URL of the group'
 
-    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 :avatar_url, GraphQL::STRING_TYPE, null: true,
+          description: 'Avatar URL of the group',
+          resolve: -> (group, args, ctx) do
+            group.avatar_url(only_path: false)
+          end
 
-    field :parent, GroupType, # rubocop:disable Graphql/Descriptions
-          null: true,
+    field :parent, GroupType, null: true,
+          description: 'Parent group',
           resolve: -> (obj, _args, _ctx) { Gitlab::Graphql::Loaders::BatchModelLoader.new(Group, obj.parent_id).find }
   end
 end
diff --git a/app/graphql/types/issue_type.rb b/app/graphql/types/issue_type.rb
index 4965601fe65..bf055bd9eef 100644
--- a/app/graphql/types/issue_type.rb
+++ b/app/graphql/types/issue_type.rb
@@ -12,53 +12,77 @@ module Types
 
     present_using IssuePresenter
 
-    field :iid, GraphQL::ID_TYPE, null: false # rubocop:disable Graphql/Descriptions
-    field :title, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :iid, GraphQL::ID_TYPE, null: false,
+          description: "Internal ID of the issue"
+    field :title, GraphQL::STRING_TYPE, null: false,
+          description: 'Title of the issue'
     markdown_field :title_html, null: true
-    field :description, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :description, GraphQL::STRING_TYPE, null: true,
+          description: 'Description of the issue'
     markdown_field :description_html, null: true
-    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
+    field :state, IssueStateEnum, null: false,
+          description: 'State of the issue'
+
+    field :reference, GraphQL::STRING_TYPE, null: false,
+          description: 'Internal reference of the issue. Returned in shortened format by default',
+          method: :to_reference do
+      argument :full, GraphQL::BOOLEAN_TYPE, required: false, default_value: false,
+               description: 'Boolean option specifying whether the reference should be returned in full'
     end
 
-    field :author, Types::UserType, # rubocop:disable Graphql/Descriptions
-          null: false,
+    field :author, Types::UserType, null: false,
+          description: 'User that created the issue',
           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 # rubocop:disable Graphql/Descriptions
+    field :assignees, Types::UserType.connection_type, null: true, complexity: 5,
+          description: 'Assignees of the issue'
 
     # Remove complexity when BatchLoader is used
-    field :labels, Types::LabelType.connection_type, null: true, complexity: 5 # rubocop:disable Graphql/Descriptions
-    field :milestone, Types::MilestoneType, # rubocop:disable Graphql/Descriptions
-          null: true,
+    field :labels, Types::LabelType.connection_type, null: true, complexity: 5,
+          description: 'Labels of the issue'
+    field :milestone, Types::MilestoneType, null: true,
+          description: 'Milestone of the issue',
           resolve: -> (obj, _args, _ctx) { Gitlab::Graphql::Loaders::BatchModelLoader.new(Milestone, obj.milestone_id).find }
 
-    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,
+    field :due_date, Types::TimeType, null: true,
+          description: 'Due date of the issue'
+    field :confidential, GraphQL::BOOLEAN_TYPE, null: false,
+          description: 'Indicates the issue is confidential'
+    field :discussion_locked, GraphQL::BOOLEAN_TYPE, null: false,
+          description: 'Indicates discussion is locked on the issue',
           resolve: -> (obj, _args, _ctx) { !!obj.discussion_locked }
 
-    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 :participants, Types::UserType.connection_type, null: true, complexity: 5, description: 'List of participants for the issue'
-    field :time_estimate, GraphQL::INT_TYPE, null: false, description: 'The time estimate on the issue'
-    field :total_time_spent, GraphQL::INT_TYPE, null: false, description: 'Total time reported as spent on the issue'
-
-    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
+    field :upvotes, GraphQL::INT_TYPE, null: false,
+          description: 'Number of upvotes the issue has received'
+    field :downvotes, GraphQL::INT_TYPE, null: false,
+          description: 'Number of downvotes the issue has received'
+    field :user_notes_count, GraphQL::INT_TYPE, null: false,
+          description: 'Number of user notes of the issue'
+    field :web_path, GraphQL::STRING_TYPE, null: false, method: :issue_path,
+          description: 'Web path of the issue'
+    field :web_url, GraphQL::STRING_TYPE, null: false,
+          description: 'Web URL of the issue'
+    field :relative_position, GraphQL::INT_TYPE, null: true,
+          description: 'Relative position of the issue (used for positioning in epic tree and issue boards)'
+
+    field :participants, Types::UserType.connection_type, null: true, complexity: 5,
+          description: 'List of participants in the issue'
+    field :time_estimate, GraphQL::INT_TYPE, null: false,
+          description: 'Time estimate of the issue'
+    field :total_time_spent, GraphQL::INT_TYPE, null: false,
+          description: 'Total time reported as spent on the issue'
+
+    field :closed_at, Types::TimeType, null: true,
+          description: 'Timestamp of when the issue was closed'
+
+    field :created_at, Types::TimeType, null: false,
+          description: 'Timestamp of when the issue was created'
+    field :updated_at, Types::TimeType, null: false,
+          description: 'Timestamp of when the issue was last updated'
+
+    field :task_completion_status, Types::TaskCompletionStatus, null: false,
+          description: 'Task completion status of the issue'
   end
 end
 
diff --git a/app/graphql/types/label_type.rb b/app/graphql/types/label_type.rb
index 384a27df563..b21503540f8 100644
--- a/app/graphql/types/label_type.rb
+++ b/app/graphql/types/label_type.rb
@@ -6,10 +6,14 @@ module Types
 
     authorize :read_label
 
-    field :description, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :description, GraphQL::STRING_TYPE, null: true,
+          description: 'Description of the label (markdown rendered as HTML for caching)'
     markdown_field :description_html, null: true
-    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
+    field :title, GraphQL::STRING_TYPE, null: false,
+          description: 'Content of the label'
+    field :color, GraphQL::STRING_TYPE, null: false,
+          description: 'Background color of the label'
+    field :text_color, GraphQL::STRING_TYPE, null: false,
+          description: 'Text color of the label'
   end
 end
diff --git a/app/graphql/types/merge_request_type.rb b/app/graphql/types/merge_request_type.rb
index 71a65dc6713..278a95fe3ca 100644
--- a/app/graphql/types/merge_request_type.rb
+++ b/app/graphql/types/merge_request_type.rb
@@ -12,70 +12,116 @@ module Types
 
     present_using MergeRequestPresenter
 
-    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
+    field :id, GraphQL::ID_TYPE, null: false,
+          description: 'ID of the merge request'
+    field :iid, GraphQL::STRING_TYPE, null: false,
+          description: 'Internal ID of the merge request'
+    field :title, GraphQL::STRING_TYPE, null: false,
+          description: 'Title of the merge request'
     markdown_field :title_html, null: true
-    field :description, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :description, GraphQL::STRING_TYPE, null: true,
+          description: 'Description of the merge request (markdown rendered as HTML for caching)'
     markdown_field :description_html, 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 # 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"
-    # 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 :state, MergeRequestStateEnum, null: false,
+          description: 'State of the merge request'
+    field :created_at, Types::TimeType, null: false,
+          description: 'Timestamp of when the merge request was created'
+    field :updated_at, Types::TimeType, null: false,
+          description: 'Timestamp of when the merge request was last updated'
+    field :source_project, Types::ProjectType, null: true,
+          description: 'Source project of the merge request'
+    field :target_project, Types::ProjectType, null: false,
+          description: 'Target project of the merge request'
+    field :diff_refs, Types::DiffRefsType, null: true,
+          description: 'References of the base SHA, the head SHA, and the start SHA for this merge request'
+    field :project, Types::ProjectType, null: false,
+          description: 'Alias for target_project'
+    field :project_id, GraphQL::INT_TYPE, null: false, method: :target_project_id,
+          description: 'ID of the merge request project'
+    field :source_project_id, GraphQL::INT_TYPE, null: true,
+          description: 'ID of the merge request source project'
+    field :target_project_id, GraphQL::INT_TYPE, null: false,
+          description: 'ID of the merge request target project'
+    field :source_branch, GraphQL::STRING_TYPE, null: false,
+          description: 'Source branch of the merge request'
+    field :target_branch, GraphQL::STRING_TYPE, null: false,
+          description: 'Target branch of the merge request'
+    field :work_in_progress, GraphQL::BOOLEAN_TYPE, method: :work_in_progress?, null: false,
+          description: 'Indicates if the merge request is a work in progress (WIP)'
+    field :merge_when_pipeline_succeeds, GraphQL::BOOLEAN_TYPE, null: true,
+          description: 'Indicates if the merge has been set to be merged when its pipeline succeeds (MWPS)'
+    field :diff_head_sha, GraphQL::STRING_TYPE, null: true,
+          description: 'Diff head SHA of the merge request'
+    field :merge_commit_sha, GraphQL::STRING_TYPE, null: true,
+          description: 'SHA of the merge request commit (set once merged)'
+    field :user_notes_count, GraphQL::INT_TYPE, null: true,
+          description: 'User notes count of the merge request'
+    field :should_remove_source_branch, GraphQL::BOOLEAN_TYPE, method: :should_remove_source_branch?, null: true,
+          description: 'Indicates if the source branch of the merge request will be deleted after merge'
+    field :force_remove_source_branch, GraphQL::BOOLEAN_TYPE, method: :force_remove_source_branch?, null: true,
+          description: 'Indicates if the project settings will lead to source branch deletion after merge'
+    field :merge_status, GraphQL::STRING_TYPE, null: true,
+          description: 'Status of the merge request'
+    field :in_progress_merge_commit_sha, GraphQL::STRING_TYPE, null: true,
+          description: 'Commit SHA of the merge request if merge is in progress'
+    field :merge_error, GraphQL::STRING_TYPE, null: true,
+          description: 'Error message due to a merge error'
+    field :allow_collaboration, GraphQL::BOOLEAN_TYPE, null: true,
+          description: 'Indicates if members of the target project can push to the fork'
+    field :should_be_rebased, GraphQL::BOOLEAN_TYPE, method: :should_be_rebased?, null: false,
+          description: 'Indicates if the merge request will be rebased'
+    field :rebase_commit_sha, GraphQL::STRING_TYPE, null: true,
+          description: 'Rebase commit SHA of the merge request'
+    field :rebase_in_progress, GraphQL::BOOLEAN_TYPE, method: :rebase_in_progress?, null: false, calls_gitaly: true,
+          description: 'Indicates if there is a rebase currently in progress for the merge request'
+    field :merge_commit_message, GraphQL::STRING_TYPE, method: :default_merge_commit_message, null: true, deprecation_reason: "Renamed to defaultMergeCommitMessage",
+          description: 'Deprecated - renamed to defaultMergeCommitMessage'
+    field :default_merge_commit_message, GraphQL::STRING_TYPE, null: true,
+          description: 'Default merge commit message of the merge request'
+    field :merge_ongoing, GraphQL::BOOLEAN_TYPE, method: :merge_ongoing?, null: false,
+          description: 'Indicates if a merge is currently occurring'
+    field :source_branch_exists, GraphQL::BOOLEAN_TYPE, method: :source_branch_exists?, null: false,
+          description: 'Indicates if the source branch of the merge request exists'
+    field :mergeable_discussions_state, GraphQL::BOOLEAN_TYPE, null: true,
+          description: 'Indicates if all discussions in the merge request have been resolved, allowing the merge request to be merged'
+    field :web_url, GraphQL::STRING_TYPE, null: true,
+          description: 'Web URL of the merge request'
+    field :upvotes, GraphQL::INT_TYPE, null: false,
+          description: 'Number of upvotes for the merge request'
+    field :downvotes, GraphQL::INT_TYPE, null: false,
+          description: 'Number of downvotes for the merge request'
 
-    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
+    field :head_pipeline, Types::Ci::PipelineType, null: true, method: :actual_head_pipeline,
+          description: 'The pipeline running on the branch HEAD of the merge request'
+    field :pipelines, Types::Ci::PipelineType.connection_type,
+          description: 'Pipelines for the merge request',
           resolver: Resolvers::MergeRequestPipelinesResolver
 
-    field :milestone, Types::MilestoneType, description: 'The milestone this merge request is linked to',
-          null: true,
+    field :milestone, Types::MilestoneType, null: true,
+          description: 'The milestone of the merge request',
           resolve: -> (obj, _args, _ctx) { Gitlab::Graphql::Loaders::BatchModelLoader.new(Milestone, obj.milestone_id).find }
-    field :assignees, Types::UserType.connection_type, null: true, complexity: 5, description: 'The list of assignees for the merge request'
-    field :participants, Types::UserType.connection_type, null: true, complexity: 5, description: 'The list of participants on the merge request'
+    field :assignees, Types::UserType.connection_type, null: true, complexity: 5,
+          description: 'Assignees of the merge request'
+    field :participants, Types::UserType.connection_type, null: true, complexity: 5,
+          description: 'Participants in the merge request'
     field :subscribed, GraphQL::BOOLEAN_TYPE, method: :subscribed?, null: false, complexity: 5,
-          description: 'Boolean flag for whether the currently logged in user is subscribed to this MR'
-    field :labels, Types::LabelType.connection_type, null: true, complexity: 5, description: 'The list of labels on the merge request'
-    field :discussion_locked, GraphQL::BOOLEAN_TYPE, description: 'Boolean flag determining if comments on the merge request are locked to members only',
+          description: 'Indicates if the currently logged in user is subscribed to this merge request'
+    field :labels, Types::LabelType.connection_type, null: true, complexity: 5,
+          description: 'Labels of the merge request'
+    field :discussion_locked, GraphQL::BOOLEAN_TYPE,
+          description: 'Indicates if comments on the merge request are locked to members only',
           null: false,
           resolve: -> (obj, _args, _ctx) { !!obj.discussion_locked }
-    field :time_estimate, GraphQL::INT_TYPE, null: false, description: 'The time estimate for the merge request'
-    field :total_time_spent, GraphQL::INT_TYPE, null: false, description: 'Total time reported as spent on the merge request'
-    field :reference, GraphQL::STRING_TYPE, null: false, method: :to_reference, description: 'Internal merge request reference. Returned in shortened format by default' do
-      argument :full, GraphQL::BOOLEAN_TYPE, required: false, default_value: false, description: 'Boolean option specifying whether the reference should be returned in full'
+    field :time_estimate, GraphQL::INT_TYPE, null: false,
+          description: 'Time estimate of the merge request'
+    field :total_time_spent, GraphQL::INT_TYPE, null: false,
+          description: 'Total time reported as spent on the merge request'
+    field :reference, GraphQL::STRING_TYPE, null: false, method: :to_reference,
+          description: 'Internal reference of the merge request. Returned in shortened format by default' do
+      argument :full, GraphQL::BOOLEAN_TYPE, required: false, default_value: false,
+               description: 'Boolean option specifying whether the reference should be returned in full'
     end
-    field :task_completion_status, Types::TaskCompletionStatus, null: false # rubocop:disable Graphql/Descriptions
+    field :task_completion_status, Types::TaskCompletionStatus, null: false,
+          description: Types::TaskCompletionStatus.description
   end
 end
diff --git a/app/graphql/types/metadata_type.rb b/app/graphql/types/metadata_type.rb
index bfcb929f5ac..1998b036a53 100644
--- a/app/graphql/types/metadata_type.rb
+++ b/app/graphql/types/metadata_type.rb
@@ -6,7 +6,9 @@ module Types
 
     authorize :read_instance_metadata
 
-    field :version, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
-    field :revision, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :version, GraphQL::STRING_TYPE, null: false,
+          description: 'Version'
+    field :revision, GraphQL::STRING_TYPE, null: false,
+          description: 'Revision'
   end
 end
diff --git a/app/graphql/types/milestone_type.rb b/app/graphql/types/milestone_type.rb
index 78d0a8220ec..1d3a1231bca 100644
--- a/app/graphql/types/milestone_type.rb
+++ b/app/graphql/types/milestone_type.rb
@@ -6,14 +6,21 @@ module Types
 
     authorize :read_milestone
 
-    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 :description, GraphQL::STRING_TYPE, null: true,
+          description: 'Description of the milestone'
+    field :title, GraphQL::STRING_TYPE, null: false,
+          description: 'Title of the milestone'
+    field :state, GraphQL::STRING_TYPE, null: false,
+          description: 'State of the milestone'
 
-    field :due_date, Types::TimeType, null: true # rubocop:disable Graphql/Descriptions
-    field :start_date, Types::TimeType, null: true # rubocop:disable Graphql/Descriptions
+    field :due_date, Types::TimeType, null: true,
+          description: 'Timestamp of the milestone due date'
+    field :start_date, Types::TimeType, null: true,
+          description: 'Timestamp of the milestone start date'
 
-    field :created_at, Types::TimeType, null: false # rubocop:disable Graphql/Descriptions
-    field :updated_at, Types::TimeType, null: false # rubocop:disable Graphql/Descriptions
+    field :created_at, Types::TimeType, null: false,
+          description: 'Timestamp of milestone creation'
+    field :updated_at, Types::TimeType, null: false,
+          description: 'Timestamp of last milestone update'
   end
 end
diff --git a/app/graphql/types/namespace_type.rb b/app/graphql/types/namespace_type.rb
index cc1d06b19e1..1714284a5cf 100644
--- a/app/graphql/types/namespace_type.rb
+++ b/app/graphql/types/namespace_type.rb
@@ -6,27 +6,35 @@ module Types
 
     authorize :read_namespace
 
-    field :id, GraphQL::ID_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :id, GraphQL::ID_TYPE, null: false,
+          description: 'ID of the namespace'
 
-    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 :name, GraphQL::STRING_TYPE, null: false,
+          description: 'Name of the namespace'
+    field :path, GraphQL::STRING_TYPE, null: false,
+          description: 'Path of the namespace'
+    field :full_name, GraphQL::STRING_TYPE, null: false,
+          description: 'Full name of the namespace'
+    field :full_path, GraphQL::ID_TYPE, null: false,
+          description: 'Full path of the namespace'
 
-    field :description, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :description, GraphQL::STRING_TYPE, null: true,
+          description: 'Description of the namespace'
     markdown_field :description_html, 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 :visibility, GraphQL::STRING_TYPE, null: true,
+          description: 'Visibility of the namespace'
+    field :lfs_enabled, GraphQL::BOOLEAN_TYPE, null: true, method: :lfs_enabled?,
+          description: 'Indicates if Large File Storage (LFS) is enabled for namespace'
+    field :request_access_enabled, GraphQL::BOOLEAN_TYPE, null: true,
+          description: 'Indicates if users can request access to namespace'
 
     field :root_storage_statistics, Types::RootStorageStatisticsType,
           null: true,
-          description: 'The aggregated storage statistics. Only available for root namespaces',
+          description: 'Aggregated storage statistics of the namespace. Only available for root namespaces',
           resolve: -> (obj, _args, _ctx) { Gitlab::Graphql::Loaders::BatchRootStorageStatisticsLoader.new(obj.id).find }
 
-    field :projects, # rubocop:disable Graphql/Descriptions
-          Types::ProjectType.connection_type,
-          null: false,
+    field :projects, Types::ProjectType.connection_type, null: false,
+          description: 'Projects within this namespace',
           resolver: ::Resolvers::NamespaceProjectsResolver
   end
 end
diff --git a/app/graphql/types/project_statistics_type.rb b/app/graphql/types/project_statistics_type.rb
index 5045471a75b..c46410df6c0 100644
--- a/app/graphql/types/project_statistics_type.rb
+++ b/app/graphql/types/project_statistics_type.rb
@@ -6,13 +6,20 @@ module Types
 
     authorize :read_statistics
 
-    field :commit_count, GraphQL::INT_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :commit_count, GraphQL::INT_TYPE, null: false,
+          description: 'Commit count of the project'
 
-    field :storage_size, GraphQL::INT_TYPE, null: false # rubocop:disable Graphql/Descriptions
-    field :repository_size, GraphQL::INT_TYPE, null: false # rubocop:disable Graphql/Descriptions
-    field :lfs_objects_size, GraphQL::INT_TYPE, null: false # rubocop:disable Graphql/Descriptions
-    field :build_artifacts_size, GraphQL::INT_TYPE, null: false # rubocop:disable Graphql/Descriptions
-    field :packages_size, GraphQL::INT_TYPE, null: false # rubocop:disable Graphql/Descriptions
-    field :wiki_size, GraphQL::INT_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :storage_size, GraphQL::INT_TYPE, null: false,
+          description: 'Storage size of the project'
+    field :repository_size, GraphQL::INT_TYPE, null: false,
+          description: 'Repository size of the project'
+    field :lfs_objects_size, GraphQL::INT_TYPE, null: false,
+          description: 'Large File Storage (LFS) object size of the project'
+    field :build_artifacts_size, GraphQL::INT_TYPE, null: false,
+          description: 'Build artifacts size of the project'
+    field :packages_size, GraphQL::INT_TYPE, null: false,
+          description: 'Packages size of the project'
+    field :wiki_size, GraphQL::INT_TYPE, null: true,
+          description: 'Wiki size of the project'
   end
 end
diff --git a/app/graphql/types/project_type.rb b/app/graphql/types/project_type.rb
index 3f05610cf1f..f1e735508cc 100644
--- a/app/graphql/types/project_type.rb
+++ b/app/graphql/types/project_type.rb
@@ -8,98 +8,142 @@ module Types
 
     expose_permissions Types::PermissionTypes::Project
 
-    field :id, GraphQL::ID_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :id, GraphQL::ID_TYPE, null: false,
+          description: 'ID of the project'
 
-    field :full_path, GraphQL::ID_TYPE, null: false # rubocop:disable Graphql/Descriptions
-    field :path, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :full_path, GraphQL::ID_TYPE, null: false,
+          description: 'Full path of the project'
+    field :path, GraphQL::STRING_TYPE, null: false,
+          description: 'Path of the project'
 
-    field :name_with_namespace, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
-    field :name, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :name_with_namespace, GraphQL::STRING_TYPE, null: false,
+          description: 'Full name of the project with its namespace'
+    field :name, GraphQL::STRING_TYPE, null: false,
+          description: 'Name of the project (without namespace)'
 
-    field :description, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :description, GraphQL::STRING_TYPE, null: true,
+          description: 'Short description of the project'
     markdown_field :description_html, null: true
 
-    field :tag_list, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
-
-    field :ssh_url_to_repo, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
-    field :http_url_to_repo, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
-    field :web_url, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
-
-    field :star_count, GraphQL::INT_TYPE, null: false # rubocop:disable Graphql/Descriptions
-    field :forks_count, GraphQL::INT_TYPE, null: false, calls_gitaly: true # 4 times # rubocop:disable Graphql/Descriptions
-
-    field :created_at, Types::TimeType, null: true # rubocop:disable Graphql/Descriptions
-    field :last_activity_at, Types::TimeType, null: true # rubocop:disable Graphql/Descriptions
-
-    field :archived, GraphQL::BOOLEAN_TYPE, null: true # rubocop:disable Graphql/Descriptions
-
-    field :visibility, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
-
-    field :container_registry_enabled, GraphQL::BOOLEAN_TYPE, null: true # rubocop:disable Graphql/Descriptions
-    field :shared_runners_enabled, GraphQL::BOOLEAN_TYPE, null: true # rubocop:disable Graphql/Descriptions
-    field :lfs_enabled, GraphQL::BOOLEAN_TYPE, null: true # rubocop:disable Graphql/Descriptions
-    field :merge_requests_ff_only_enabled, GraphQL::BOOLEAN_TYPE, null: true # rubocop:disable Graphql/Descriptions
-
-    field :avatar_url, GraphQL::STRING_TYPE, null: true, calls_gitaly: true, resolve: -> (project, args, ctx) do # rubocop:disable Graphql/Descriptions
-      project.avatar_url(only_path: false)
-    end
+    field :tag_list, GraphQL::STRING_TYPE, null: true,
+          description: 'List of project tags'
+
+    field :ssh_url_to_repo, GraphQL::STRING_TYPE, null: true,
+          description: 'URL to connect to the project via SSH'
+    field :http_url_to_repo, GraphQL::STRING_TYPE, null: true,
+          description: 'URL to connect to the project via HTTPS'
+    field :web_url, GraphQL::STRING_TYPE, null: true,
+          description: 'Web URL of the project'
+
+    field :star_count, GraphQL::INT_TYPE, null: false,
+          description: 'Number of times the project has been starred'
+    field :forks_count, GraphQL::INT_TYPE, null: false, calls_gitaly: true, # 4 times
+          description: 'Number of times the project has been forked'
+
+    field :created_at, Types::TimeType, null: true,
+          description: 'Timestamp of the project creation'
+    field :last_activity_at, Types::TimeType, null: true,
+          description: 'Timestamp of the project last activity'
+
+    field :archived, GraphQL::BOOLEAN_TYPE, null: true,
+          description: 'Archived status of the project'
+
+    field :visibility, GraphQL::STRING_TYPE, null: true,
+          description: 'Visibility of the project'
+
+    field :container_registry_enabled, GraphQL::BOOLEAN_TYPE, null: true,
+          description: 'Indicates if the project stores Docker container images in a container registry'
+    field :shared_runners_enabled, GraphQL::BOOLEAN_TYPE, null: true,
+          description: 'Indicates if shared runners are enabled on the project'
+    field :lfs_enabled, GraphQL::BOOLEAN_TYPE, null: true,
+          description: 'Indicates if the project has Large File Storage (LFS) enabled'
+    field :merge_requests_ff_only_enabled, GraphQL::BOOLEAN_TYPE, null: true,
+          description: 'Indicates if no merge commits should be created and all merges should instead be fast-forwarded, which means that merging is only allowed if the branch could be fast-forwarded.'
+
+    field :avatar_url, GraphQL::STRING_TYPE, null: true, calls_gitaly: true,
+          description: 'URL to avatar image file of the project',
+          resolve: -> (project, args, ctx) do
+            project.avatar_url(only_path: false)
+          end
 
     %i[issues merge_requests wiki snippets].each do |feature|
-      field "#{feature}_enabled", GraphQL::BOOLEAN_TYPE, null: true, resolve: -> (project, args, ctx) do # rubocop:disable Graphql/Descriptions
-        project.feature_available?(feature, ctx[:current_user])
-      end
+      field "#{feature}_enabled", GraphQL::BOOLEAN_TYPE, null: true,
+            description: "(deprecated) Does this project have #{feature} enabled?. Use `#{feature}_access_level` instead",
+            resolve: -> (project, args, ctx) do
+              project.feature_available?(feature, ctx[:current_user])
+            end
     end
 
-    field :jobs_enabled, GraphQL::BOOLEAN_TYPE, null: true, resolve: -> (project, args, ctx) do # rubocop:disable Graphql/Descriptions
-      project.feature_available?(:builds, ctx[:current_user])
-    end
-
-    field :public_jobs, GraphQL::BOOLEAN_TYPE, method: :public_builds, null: true # rubocop:disable Graphql/Descriptions
-
-    field :open_issues_count, GraphQL::INT_TYPE, null: true, resolve: -> (project, args, ctx) do # rubocop:disable Graphql/Descriptions
-      project.open_issues_count if project.feature_available?(:issues, ctx[:current_user])
-    end
-
-    field :import_status, GraphQL::STRING_TYPE, null: true # rubocop:disable Graphql/Descriptions
-
-    field :only_allow_merge_if_pipeline_succeeds, GraphQL::BOOLEAN_TYPE, null: true # rubocop:disable Graphql/Descriptions
-    field :request_access_enabled, GraphQL::BOOLEAN_TYPE, null: true # rubocop:disable Graphql/Descriptions
-    field :only_allow_merge_if_all_discussions_are_resolved, GraphQL::BOOLEAN_TYPE, null: true # rubocop:disable Graphql/Descriptions
-    field :printing_merge_request_link_enabled, GraphQL::BOOLEAN_TYPE, null: true # rubocop:disable Graphql/Descriptions
-    field :remove_source_branch_after_merge, GraphQL::BOOLEAN_TYPE, null: true, description: 'Remove the source branch by default after merge'
-
-    field :namespace, Types::NamespaceType, null: true # rubocop:disable Graphql/Descriptions
-    field :group, Types::GroupType, null: true # rubocop:disable Graphql/Descriptions
-
-    field :statistics, Types::ProjectStatisticsType, # rubocop:disable Graphql/Descriptions
+    field :jobs_enabled, GraphQL::BOOLEAN_TYPE, null: true,
+          description: '(deprecated) Enable jobs for this project. Use `builds_access_level` instead',
+          resolve: -> (project, args, ctx) do
+            project.feature_available?(:builds, ctx[:current_user])
+          end
+
+    field :public_jobs, GraphQL::BOOLEAN_TYPE, method: :public_builds, null: true,
+          description: 'Indicates if there is public access to pipelines and job details of the project, including output logs and artifacts'
+
+    field :open_issues_count, GraphQL::INT_TYPE, null: true,
+          description: 'Number of open issues for the project',
+          resolve: -> (project, args, ctx) do
+            project.open_issues_count if project.feature_available?(:issues, ctx[:current_user])
+          end
+
+    field :import_status, GraphQL::STRING_TYPE, null: true,
+          description: 'Status of project import background job of the project'
+
+    field :only_allow_merge_if_pipeline_succeeds, GraphQL::BOOLEAN_TYPE, null: true,
+          description: 'Indicates if merge requests of the project can only be merged with successful jobs'
+    field :request_access_enabled, GraphQL::BOOLEAN_TYPE, null: true,
+          description: 'Indicates if users can request member access to the project'
+    field :only_allow_merge_if_all_discussions_are_resolved, GraphQL::BOOLEAN_TYPE, null: true,
+          description: 'Indicates if merge requests of the project can only be merged when all the discussions are resolved'
+    field :printing_merge_request_link_enabled, GraphQL::BOOLEAN_TYPE, null: true,
+          description: 'Indicates if a link to create or view a merge request should display after a push to Git repositories of the project from the command line'
+    field :remove_source_branch_after_merge, GraphQL::BOOLEAN_TYPE, null: true,
+          description: 'Indicates if `Delete source branch` option should be enabled by default for all new merge requests of the project'
+
+    field :namespace, Types::NamespaceType, null: true,
+          description: 'Namespace of the project'
+    field :group, Types::GroupType, null: true,
+          description: 'Group of the project'
+
+    field :statistics, Types::ProjectStatisticsType,
           null: true,
+          description: 'Statistics of the project',
           resolve: -> (obj, _args, _ctx) { Gitlab::Graphql::Loaders::BatchProjectStatisticsLoader.new(obj.id).find }
 
-    field :repository, Types::RepositoryType, null: true # rubocop:disable Graphql/Descriptions
+    field :repository, Types::RepositoryType, null: true,
+          description: 'Git repository of the project'
 
-    field :merge_requests, # rubocop:disable Graphql/Descriptions
+    field :merge_requests,
           Types::MergeRequestType.connection_type,
           null: true,
+          description: 'Merge requests of the project',
           resolver: Resolvers::MergeRequestsResolver
 
-    field :merge_request, # rubocop:disable Graphql/Descriptions
+    field :merge_request,
           Types::MergeRequestType,
           null: true,
+          description: 'A single merge request of the project',
           resolver: Resolvers::MergeRequestsResolver.single
 
-    field :issues, # rubocop:disable Graphql/Descriptions
+    field :issues,
           Types::IssueType.connection_type,
           null: true,
+          description: 'Issues of the project',
           resolver: Resolvers::IssuesResolver
 
-    field :issue, # rubocop:disable Graphql/Descriptions
+    field :issue,
           Types::ExtendedIssueType,
           null: true,
+          description: 'A single issue of the project',
           resolver: Resolvers::IssuesResolver.single
 
-    field :pipelines, # rubocop:disable Graphql/Descriptions
+    field :pipelines,
           Types::Ci::PipelineType.connection_type,
           null: true,
+          description: 'Build pipelines of the project',
           resolver: Resolvers::ProjectPipelinesResolver
   end
 end
diff --git a/app/graphql/types/repository_type.rb b/app/graphql/types/repository_type.rb
index 9ecd336b41d..f0c25e13a26 100644
--- a/app/graphql/types/repository_type.rb
+++ b/app/graphql/types/repository_type.rb
@@ -6,9 +6,13 @@ module Types
 
     authorize :download_code
 
-    field :root_ref, GraphQL::STRING_TYPE, null: true, calls_gitaly: true # rubocop:disable Graphql/Descriptions
-    field :empty, GraphQL::BOOLEAN_TYPE, null: false, method: :empty?, calls_gitaly: true # rubocop:disable Graphql/Descriptions
-    field :exists, GraphQL::BOOLEAN_TYPE, null: false, method: :exists? # rubocop:disable Graphql/Descriptions
-    field :tree, Types::Tree::TreeType, null: true, resolver: Resolvers::TreeResolver, calls_gitaly: true # rubocop:disable Graphql/Descriptions
+    field :root_ref, GraphQL::STRING_TYPE, null: true, calls_gitaly: true,
+          description: 'Default branch of the repository'
+    field :empty, GraphQL::BOOLEAN_TYPE, null: false, method: :empty?, calls_gitaly: true,
+          description: 'Indicates repository has no visible content'
+    field :exists, GraphQL::BOOLEAN_TYPE, null: false, method: :exists?,
+          description: 'Indicates a corresponding Git repository exists on disk'
+    field :tree, Types::Tree::TreeType, null: true, resolver: Resolvers::TreeResolver, calls_gitaly: true,
+          description: 'Tree of the repository'
   end
 end
diff --git a/app/graphql/types/task_completion_status.rb b/app/graphql/types/task_completion_status.rb
index 0aa8fc60a7c..73a8b4f3020 100644
--- a/app/graphql/types/task_completion_status.rb
+++ b/app/graphql/types/task_completion_status.rb
@@ -8,8 +8,10 @@ module Types
     graphql_name 'TaskCompletionStatus'
     description 'Completion status of tasks'
 
-    field :count, GraphQL::INT_TYPE, null: false # rubocop:disable Graphql/Descriptions
-    field :completed_count, GraphQL::INT_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :count, GraphQL::INT_TYPE, null: false,
+          description: 'Number of total tasks'
+    field :completed_count, GraphQL::INT_TYPE, null: false,
+          description: 'Number of completed tasks'
   end
   # rubocop: enable Graphql/AuthorizeTypes
 end
diff --git a/app/graphql/types/user_type.rb b/app/graphql/types/user_type.rb
index 1ba37927b40..b45c7893e75 100644
--- a/app/graphql/types/user_type.rb
+++ b/app/graphql/types/user_type.rb
@@ -8,12 +8,16 @@ module Types
 
     present_using UserPresenter
 
-    field :name, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
-    field :username, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
-    field :avatar_url, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
-    field :web_url, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions
+    field :name, GraphQL::STRING_TYPE, null: false,
+          description: 'Human-readable name of the user'
+    field :username, GraphQL::STRING_TYPE, null: false,
+          description: 'Username of the user. Unique within this instance of GitLab'
+    field :avatar_url, GraphQL::STRING_TYPE, null: false,
+          description: "URL of the user's avatar"
+    field :web_url, GraphQL::STRING_TYPE, null: false,
+          description: 'Web URL of the user'
     field :todos, Types::TodoType.connection_type, null: false,
           resolver: Resolvers::TodoResolver,
-          description: 'Todos of this user'
+          description: 'Todos of the user'
   end
 end
diff --git a/app/views/projects/merge_requests/creations/_new_submit.html.haml b/app/views/projects/merge_requests/creations/_new_submit.html.haml
index 543441b9479..15c83f92474 100644
--- a/app/views/projects/merge_requests/creations/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/creations/_new_submit.html.haml
@@ -1,15 +1,5 @@
 %h3.page-title
   New Merge Request
-%p.slead
-  - source_title, target_title = format_mr_branch_names(@merge_request)
-  From
-  %strong.ref-name= source_title
-  %span into
-  %strong.ref-name= target_title
-
-  %span.float-right
-    = link_to 'Change branches', mr_change_branches_path(@merge_request)
-%hr
 = form_for [@project.namespace.becomes(Namespace), @project, @merge_request], html: { class: 'merge-request-form common-note-form js-requires-input js-quick-submit' } do |f|
   = render 'shared/issuable/form', f: f, issuable: @merge_request, commits: @commits, presenter: @mr_presenter
   = f.hidden_field :source_project_id
diff --git a/app/views/projects/merge_requests/edit.html.haml b/app/views/projects/merge_requests/edit.html.haml
index 03159f123f3..318c9d809c1 100644
--- a/app/views/projects/merge_requests/edit.html.haml
+++ b/app/views/projects/merge_requests/edit.html.haml
@@ -2,5 +2,4 @@
 
 %h3.page-title
   Edit Merge Request #{@merge_request.to_reference}
-%hr
 = render 'form'
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 5e2b5f95ee3..a8aae03aad7 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -12,6 +12,9 @@
     = link_to "the #{issuable.class.model_name.human.downcase}", polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable]), target: "_blank", rel: 'noopener noreferrer'
     and make sure your changes will not unintentionally remove theirs
 
+= render 'shared/issuable/form/branch_chooser', issuable: issuable, form: form
+
+%hr
 .form-group.row
   = form.label :title, class: 'col-form-label col-sm-2'
 
@@ -34,8 +37,6 @@
 
 = render_if_exists 'shared/issuable/approvals', issuable: issuable, presenter: presenter, form: form
 
-= render 'shared/issuable/form/branch_chooser', issuable: issuable, form: form
-
 = render 'shared/issuable/form/merge_params', issuable: issuable
 
 = render 'shared/issuable/form/contribution', issuable: issuable, form: form
diff --git a/app/views/shared/issuable/form/_branch_chooser.html.haml b/app/views/shared/issuable/form/_branch_chooser.html.haml
index fbc96baa0f7..03eebe7c987 100644
--- a/app/views/shared/issuable/form/_branch_chooser.html.haml
+++ b/app/views/shared/issuable/form/_branch_chooser.html.haml
@@ -4,21 +4,19 @@
 - return unless issuable.is_a?(MergeRequest)
 - return if issuable.closed_without_fork?
 
-%hr
-- if issuable.new_record?
-  .form-group.row
-    = form.label :source_branch, class: 'col-form-label col-sm-2'
-    .col-sm-10
-      .issuable-form-select-holder
-        = form.select(:source_branch, [issuable.source_branch], {}, { class: 'source_branch select2 ref-name', disabled: true })
-.form-group.row
-  = form.label :target_branch, class: 'col-form-label col-sm-2'
-  .col-sm-10.target-branch-select-dropdown-container
-    .issuable-form-select-holder
-      = form.hidden_field(:target_branch,
-        { class: 'target_branch js-target-branch-select ref-name',
-          disabled: issuable.new_record?,
-          data: { placeholder: "Select branch", endpoint: refs_project_path(@project, sort: 'updated_desc', find: 'branches') }})
+- source_title, target_title = format_mr_branch_names(@merge_request)
+
+.form-group.row.d-flex.gl-pl-3.gl-pr-3.branch-selector
+  .align-self-center
+    %span= s_('From %{source_title} into').html_safe % { source_title: "<code>#{source_title}</code>".html_safe }
     - if issuable.new_record?
+      %code= target_title
       &nbsp;
-      = link_to 'Change branches', mr_change_branches_path(issuable)
+      = link_to _('Change branches'), mr_change_branches_path(issuable)
+    - elsif issuable.for_fork?
+      %code= issuable.target_project_path + ":"
+  - unless issuable.new_record?
+    %span.dropdown.prepend-left-5.d-inline-block
+      = form.hidden_field(:target_branch,
+        { class: 'target_branch js-target-branch-select ref-name mw-xl',
+          data: { placeholder: _('Select branch'), endpoint: refs_project_path(@project, sort: 'updated_desc', find: 'branches') }})
diff --git a/app/views/shared/issuable/form/_merge_params.html.haml b/app/views/shared/issuable/form/_merge_params.html.haml
index f0c4acdd07f..1b557214e02 100644
--- a/app/views/shared/issuable/form/_merge_params.html.haml
+++ b/app/views/shared/issuable/form/_merge_params.html.haml
@@ -3,17 +3,17 @@
 - return unless issuable.is_a?(MergeRequest)
 - return if issuable.closed_without_fork?
 
-- if issuable.can_remove_source_branch?(current_user)
-  .form-group.row
-    .col-sm-10.offset-sm-2
-      .form-check
+.form-group.row
+  .col-sm-2.col-form-label.pt-sm-0
+    %label
+      = _('Merge options')
+  .col-sm-10
+    - if issuable.can_remove_source_branch?(current_user)
+      .form-check.append-bottom-default
         = hidden_field_tag 'merge_request[force_remove_source_branch]', '0', id: nil
         = check_box_tag 'merge_request[force_remove_source_branch]', '1', issuable.force_remove_source_branch?, class: 'form-check-input'
         = label_tag 'merge_request[force_remove_source_branch]', class: 'form-check-label' do
           Delete source branch when merge request is accepted.
-
-.form-group.row
-  .col-sm-10.offset-sm-2
     .form-check
       = hidden_field_tag 'merge_request[squash]', '0', id: nil
       = check_box_tag 'merge_request[squash]', '1', issuable.squash, class: 'form-check-input'
diff --git a/app/views/shared/notifications/_button.html.haml b/app/views/shared/notifications/_button.html.haml
index 441abd57334..2b3e986a841 100644
--- a/app/views/shared/notifications/_button.html.haml
+++ b/app/views/shared/notifications/_button.html.haml
@@ -17,14 +17,14 @@
       .js-notification-toggle-btns
         %div{ class: ("btn-group" if notification_setting.custom?) }
           - if notification_setting.custom?
-            %button.dropdown-new.btn.btn-default.btn-xs.has-tooltip.notifications-btn.text-left#notifications-button{ type: "button", title: button_title, class: "#{btn_class}", "aria-label" => aria_label, data: { container: "body", toggle: "modal", target: "#" + notifications_menu_identifier("modal", notification_setting), display: 'static' } }
+            %button.dropdown-new.btn.btn-default.has-tooltip.notifications-btn.text-left#notifications-button{ type: "button", title: button_title, class: "#{btn_class}", "aria-label" => aria_label, data: { container: "body", toggle: "modal", target: "#" + notifications_menu_identifier("modal", notification_setting), display: 'static' } }
               = icon("bell", class: "js-notification-loading")
               = notification_title(notification_setting.level)
-            %button.btn.dropdown-toggle{ data: { toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting), flip: "false" } }
+            %button.btn.dropdown-toggle.d-flex{ data: { toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting), flip: "false" } }
               = icon('caret-down')
               .sr-only Toggle dropdown
           - else
-            %button.dropdown-new.btn.btn-default.btn-xs.has-tooltip.notifications-btn#notifications-button{ type: "button", title: button_title, class: "#{btn_class}", "aria-label" => aria_label, data: { container: "body", toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting), flip: "false" } }
+            %button.dropdown-new.btn.btn-default.has-tooltip.notifications-btn#notifications-button{ type: "button", title: button_title, class: "#{btn_class}", "aria-label" => aria_label, data: { container: "body", toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting), flip: "false" } }
               .float-left
                 = icon("bell", class: "js-notification-loading")
                 = notification_title(notification_setting.level)
diff --git a/app/views/shared/notifications/_custom_notifications.html.haml b/app/views/shared/notifications/_custom_notifications.html.haml
index 43a87fd8397..1fef43c0c37 100644
--- a/app/views/shared/notifications/_custom_notifications.html.haml
+++ b/app/views/shared/notifications/_custom_notifications.html.haml
@@ -1,3 +1,5 @@
+- hide_label = local_assigns.fetch(:hide_label, false)
+
 .modal.fade{ tabindex: "-1", role: "dialog", id: notifications_menu_identifier("modal", notification_setting), "aria-labelledby": "custom-notifications-title" }
   .modal-dialog
     .modal-content
@@ -11,6 +13,7 @@
         .container-fluid
           = form_for notification_setting, html: { class: "custom-notifications-form" } do |f|
             = hidden_setting_source_input(notification_setting)
+            = hidden_field_tag("hide_label", true) if hide_label
             .row
               .col-lg-4
                 %h4.prepend-top-0= _('Notification events')
diff --git a/app/views/shared/notifications/_new_button.html.haml b/app/views/shared/notifications/_new_button.html.haml
index 3c8cc023848..363053b5e35 100644
--- a/app/views/shared/notifications/_new_button.html.haml
+++ b/app/views/shared/notifications/_new_button.html.haml
@@ -31,4 +31,4 @@
           = render "shared/notifications/notification_dropdown", notification_setting: notification_setting
 
           = content_for :scripts_body do
-            = render "shared/notifications/custom_notifications", notification_setting: notification_setting
+            = render "shared/notifications/custom_notifications", notification_setting: notification_setting, hide_label: true