BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit bc493bd8 by Annabel Dunstone Committed by Annabel Dunstone Gray
Options

Add pipelines tab to new MR

parent eb541b4f
Showing with 7 additions and 0 deletions
app/views/projects/merge_requests/_new_submit.html.haml
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
= f.hidden_field :target_branch = f.hidden_field :target_branch
.mr-compare.merge-request .mr-compare.merge-request
<<<<<<< 4a8cb230c6ba28ccdcd6da91855005e4fa0c46bf
- if @commits.empty? - if @commits.empty?
.commits-empty .commits-empty
%h4 %h4
...@@ -31,6 +32,10 @@ ...@@ -31,6 +32,10 @@
%span.badge= @commits.size %span.badge= @commits.size
- if @pipeline - if @pipeline
%li.builds-tab %li.builds-tab
= link_to url_for(params), data: {target: 'div#pipelines', action: 'pipelines', toggle: 'tab'} do
Pipelines
%span.badge= @statuses.size
%li.builds-tab
= link_to url_for(params), data: {target: 'div#builds', action: 'builds', toggle: 'tab'} do = link_to url_for(params), data: {target: 'div#builds', action: 'builds', toggle: 'tab'} do
Builds Builds
%span.badge= @statuses.size %span.badge= @statuses.size
...@@ -47,6 +52,8 @@ ...@@ -47,6 +52,8 @@
- if @pipeline - if @pipeline
#builds.builds.tab-pane #builds.builds.tab-pane
= render "projects/merge_requests/show/builds" = render "projects/merge_requests/show/builds"
#pipelines.pipelines.tab-pane
= render "projects/merge_requests/show/pipelines"
.mr-loading-status .mr-loading-status
= spinner = spinner
......
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