Commit 0d6d7f6e authored by Annabel Dunstone's avatar Annabel Dunstone

Display all pipelines for Merge Request

parent 46cfd642
...@@ -137,6 +137,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController ...@@ -137,6 +137,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end end
def pipelines def pipelines
@pipelines = Ci::Pipeline.where(ref: @merge_request.source_branch)
respond_to do |format| respond_to do |format|
format.html do format.html do
define_discussion_vars define_discussion_vars
......
...@@ -14,4 +14,4 @@ ...@@ -14,4 +14,4 @@
= stage.titleize = stage.titleize
%th %th
%th %th
= render pipelines, commit_sha: true, stage: true, allow_retry: true, stages: stages = render pipelines, commit_sha: true, stage: true, allow_retry: true, stages: pipelines.stages
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
%li.pipelines-tab %li.pipelines-tab
= link_to pipelines_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: '#pipelines', action: 'pipelines', toggle: 'tab'} do = link_to pipelines_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: '#pipelines', action: 'pipelines', toggle: 'tab'} do
Pipelines Pipelines
%span.badge= @statuses.size %span.badge
%li.builds-tab %li.builds-tab
= link_to builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: '#builds', action: 'builds', toggle: 'tab'} do = link_to builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: '#builds', action: 'builds', toggle: 'tab'} do
Builds Builds
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment