Commit 1a959e1b authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '5491-backport-code' into 'master'

Pipeline security dashboard: Backport code from EE

See merge request gitlab-org/gitlab-ce!20733
parents 65f27de7 e35f8d9c
...@@ -33,3 +33,5 @@ ...@@ -33,3 +33,5 @@
%span.js-details-content.hide %span.js-details-content.hide
= link_to @pipeline.sha, project_commit_path(@project, @pipeline.sha), class: "commit-sha commit-hash-full" = link_to @pipeline.sha, project_commit_path(@project, @pipeline.sha), class: "commit-sha commit-hash-full"
= clipboard_button(text: @pipeline.sha, title: "Copy commit SHA to clipboard") = clipboard_button(text: @pipeline.sha, title: "Copy commit SHA to clipboard")
= render_if_exists "projects/pipelines/info_extension", pipeline: @pipeline
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
= link_to failures_project_pipeline_path(@project, @pipeline), data: { target: '#js-tab-failures', action: 'failures', toggle: 'tab' }, class: 'failures-tab' do = link_to failures_project_pipeline_path(@project, @pipeline), data: { target: '#js-tab-failures', action: 'failures', toggle: 'tab' }, class: 'failures-tab' do
= _("Failed Jobs") = _("Failed Jobs")
%span.badge.badge-pill.js-failures-counter= @pipeline.failed_builds.count %span.badge.badge-pill.js-failures-counter= @pipeline.failed_builds.count
= render_if_exists "projects/pipelines/tabs_holder", pipeline: @pipeline, project: @project
.tab-content .tab-content
#js-tab-pipeline.tab-pane #js-tab-pipeline.tab-pane
...@@ -75,4 +76,4 @@ ...@@ -75,4 +76,4 @@
%pre.build-trace.build-trace-rounded %pre.build-trace.build-trace-rounded
%code.bash.js-build-output %code.bash.js-build-output
= build_summary(build) = build_summary(build)
= render_if_exists "projects/pipelines/tabs_content", pipeline: @pipeline, project: @project
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
= form_errors(@pipeline) = form_errors(@pipeline)
.form-group.row .form-group.row
.col-sm-12 .col-sm-12
= f.label :ref, s_('Pipeline|Create for') = f.label :ref, s_('Pipeline|Create for'), class: 'col-form-label'
= hidden_field_tag 'pipeline[ref]', params[:ref] || @project.default_branch = hidden_field_tag 'pipeline[ref]', params[:ref] || @project.default_branch
= dropdown_tag(params[:ref] || @project.default_branch, = dropdown_tag(params[:ref] || @project.default_branch,
options: { toggle_class: 'js-branch-select wide git-revision-dropdown-toggle', options: { toggle_class: 'js-branch-select wide git-revision-dropdown-toggle',
......
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