Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 0 deletions

diff --git a/app/graphql/types/ci/pipeline_type.rb b/app/graphql/types/ci/pipeline_type.rb
index dfdc3752916..65244235e10 100644
--- a/app/graphql/types/ci/pipeline_type.rb
+++ b/app/graphql/types/ci/pipeline_type.rb
@@ -199,6 +199,10 @@ module Types
 
       field :stuck, GraphQL::Types::Boolean, method: :stuck?, null: false, description: "If the pipeline is stuck."
 
+      field :yaml_errors, GraphQL::Types::Boolean, method: :yaml_errors?, null: false, description: "If the pipeline has YAML errors."
+
+      field :trigger, GraphQL::Types::Boolean, method: :trigger?, null: false, description: "If the pipeline was created by a Trigger request."
+
       def commit
         BatchLoader::GraphQL.wrap(object.commit)
       end
diff --git a/app/views/projects/_importing_alert.haml b/app/views/projects/_importing_alert.haml
new file mode 100644
index 00000000000..192f952e460
--- /dev/null
+++ b/app/views/projects/_importing_alert.haml
@@ -0,0 +1,6 @@
+- return unless project.import_in_progress?
+
+- content_for :page_level_alert do
+  = render Pajamas::AlertComponent.new(variant: :warning, dismissible: false, title: _('Import in progress'), alert_options: { class: 'gl-mb-3' }) do |c|
+    - c.with_body do
+      = s_('Import|This project is being imported. Do not make any changes to the project until the import is complete.')