Add latest changes from gitlab-org/gitlab@master

7 files changed, 27 insertions, 10 deletions

diff --git a/app/assets/stylesheets/framework/system_messages.scss b/app/assets/stylesheets/framework/system_messages.scss
index 5c298d5a588..4f66d6bf354 100644
--- a/app/assets/stylesheets/framework/system_messages.scss
+++ b/app/assets/stylesheets/framework/system_messages.scss
@@ -83,12 +83,20 @@
   // right sidebar eg: mr page
   .nav-sidebar,
   .right-sidebar,
-    // navless pages' footer eg: login page
-    // navless pages' footer border eg: login page
+  // navless pages' footer eg: login page
+  // navless pages' footer border eg: login page
   &.devise-layout-html body .footer-container,
   &.devise-layout-html body hr.footer-fixed {
     bottom: $system-footer-height;
   }
+
+  .content-wrapper {
+    margin-bottom: 16px;
+  }
+
+  .boards-list {
+    height: calc(100vh - #{$header-height + $breadcrumb-min-height + $performance-bar-height + $system-footer-height + $gl-padding-32});
+  }
 }
 
 .fullscreen-layout {
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index 6e59f742bf0..cf1555da8b3 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -96,7 +96,14 @@ class Projects::PipelinesController < Projects::ApplicationController
   end
 
   def dag
-    render_show
+    respond_to do |format|
+      format.html { render_show }
+      format.json do
+        render json: Ci::DagPipelineSerializer
+          .new(project: @project, current_user: @current_user)
+          .represent(@pipeline)
+      end
+    end
   end
 
   def failures
diff --git a/app/models/ci/processable.rb b/app/models/ci/processable.rb
index cc00500662d..ac5785d9c91 100644
--- a/app/models/ci/processable.rb
+++ b/app/models/ci/processable.rb
@@ -4,12 +4,8 @@ module Ci
   class Processable < ::CommitStatus
     include Gitlab::Utils::StrongMemoize
 
-    has_many :needs, class_name: 'Ci::BuildNeed', foreign_key: :build_id, inverse_of: :build
-
     accepts_nested_attributes_for :needs
 
-    enum scheduling_type: { stage: 0, dag: 1 }, _prefix: true
-
     scope :preload_needs, -> { preload(:needs) }
 
     scope :with_needs, -> (names = nil) do
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 7e99f128dad..8f152280b51 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -14,6 +14,10 @@ class CommitStatus < ApplicationRecord
   belongs_to :pipeline, class_name: 'Ci::Pipeline', foreign_key: :commit_id
   belongs_to :auto_canceled_by, class_name: 'Ci::Pipeline'
 
+  has_many :needs, class_name: 'Ci::BuildNeed', foreign_key: :build_id, inverse_of: :build
+
+  enum scheduling_type: { stage: 0, dag: 1 }, _prefix: true
+
   delegate :commit, to: :pipeline
   delegate :sha, :short_sha, :before_sha, to: :pipeline
 
diff --git a/app/serializers/ci/dag_job_entity.rb b/app/serializers/ci/dag_job_entity.rb
index b4947319ed1..ed4d4505152 100644
--- a/app/serializers/ci/dag_job_entity.rb
+++ b/app/serializers/ci/dag_job_entity.rb
@@ -3,6 +3,7 @@
 module Ci
   class DagJobEntity < Grape::Entity
     expose :name
+    expose :scheduling_type
 
     expose :needs, if: -> (job, _) { job.scheduling_type_dag? } do |job|
       job.needs.pluck(:name) # rubocop: disable CodeReuse/ActiveRecord
diff --git a/app/serializers/ci/dag_pipeline_entity.rb b/app/serializers/ci/dag_pipeline_entity.rb
index b615dd2b194..51aa487ec29 100644
--- a/app/serializers/ci/dag_pipeline_entity.rb
+++ b/app/serializers/ci/dag_pipeline_entity.rb
@@ -2,12 +2,12 @@
 
 module Ci
   class DagPipelineEntity < Grape::Entity
-    expose :ordered_stages_with_preloads, as: :stages, using: Ci::DagStageEntity
+    expose :stages_with_preloads, as: :stages, using: Ci::DagStageEntity
 
     private
 
-    def ordered_stages_with_preloads
-      object.ordered_stages.preload(preloaded_relations) # rubocop: disable CodeReuse/ActiveRecord
+    def stages_with_preloads
+      object.stages.preload(preloaded_relations) # rubocop: disable CodeReuse/ActiveRecord
     end
 
     def preloaded_relations
diff --git a/app/views/projects/pipelines/_with_tabs.html.haml b/app/views/projects/pipelines/_with_tabs.html.haml
index e39f543d42e..ff1aa73cddb 100644
--- a/app/views/projects/pipelines/_with_tabs.html.haml
+++ b/app/views/projects/pipelines/_with_tabs.html.haml
@@ -82,6 +82,7 @@
 
   - if dag_pipeline_tab_enabled
     #js-tab-dag.tab-pane
+      #js-pipeline-dag-vue{ data: { pipeline_data_path: dag_project_pipeline_path(@project, @pipeline) } }
 
   #js-tab-tests.tab-pane
     #js-pipeline-tests-detail