Automatic merge of gitlab-org/gitlab-ce master

app/graphql/types/merge_request_type.rb

@@ -38,7 +38,6 @@ module Types
     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
-    field :diff_head_sha, GraphQL::STRING_TYPE, null: true
     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

app/views/shared/empty_states/_priority_labels.html.haml

 .text-center
-  .svg-content
+  .svg-content.qa-label-svg
     = image_tag 'illustrations/priority_labels.svg'
   %p Star labels to start sorting by priority

danger/documentation/Dangerfile

 # frozen_string_literal: true
 
-docs_paths_to_review = helper.changes_by_category[:documentation]
+docs_paths_to_review = helper.changes_by_category[:docs]
 
 unless docs_paths_to_review.empty?
   message 'This merge request adds or changes files that require a ' \

qa/qa/page/label/index.rb

@@ -14,6 +14,10 @@ module QA
           element :label_svg
         end
 
+        view 'app/views/shared/empty_states/_priority_labels.html.haml' do
+          element :label_svg
+        end
+
         def go_to_new_label
           # The 'labels.svg' takes a fraction of a second to load after which the "New label" button shifts up a bit
           # This can cause webdriver to miss the hit so we wait for the svg to load (implicitly with has_element?)