diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-23 13:33:08 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-23 13:33:08 +0000 |
| commit | 1a959e1bf4269b3c74cb317d18bcc624436aabc5 (patch) | |
| tree | ed843e38a48d3b5c731e39853820f538ad0fddbd | |
| parent | 65f27de7a2415bc50bebdb5f0cc8613fe87f8daf (diff) | |
| parent | e35f8d9c6d7d679ba4915aa1ac9ec59683e84ac5 (diff) | |
| download | gitlab-ce-1a959e1bf4269b3c74cb317d18bcc624436aabc5.tar.gz | |
Merge branch '5491-backport-code' into 'master'
Pipeline security dashboard: Backport code from EE
See merge request gitlab-org/gitlab-ce!20733
| -rw-r--r-- | app/views/projects/pipelines/_info.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/pipelines/_with_tabs.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/pipelines/new.html.haml | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml index 04131a90a57..bc247460d28 100644 --- a/app/views/projects/pipelines/_info.html.haml +++ b/app/views/projects/pipelines/_info.html.haml @@ -33,3 +33,5 @@ %span.js-details-content.hide = 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") + + = render_if_exists "projects/pipelines/info_extension", pipeline: @pipeline diff --git a/app/views/projects/pipelines/_with_tabs.html.haml b/app/views/projects/pipelines/_with_tabs.html.haml index 951f80b378d..c63ff070f70 100644 --- a/app/views/projects/pipelines/_with_tabs.html.haml +++ b/app/views/projects/pipelines/_with_tabs.html.haml @@ -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 = _("Failed Jobs") %span.badge.badge-pill.js-failures-counter= @pipeline.failed_builds.count + = render_if_exists "projects/pipelines/tabs_holder", pipeline: @pipeline, project: @project .tab-content #js-tab-pipeline.tab-pane @@ -75,4 +76,4 @@ %pre.build-trace.build-trace-rounded %code.bash.js-build-output = build_summary(build) - + = render_if_exists "projects/pipelines/tabs_content", pipeline: @pipeline, project: @project diff --git a/app/views/projects/pipelines/new.html.haml b/app/views/projects/pipelines/new.html.haml index 956f8fef6b8..c13e3194340 100644 --- a/app/views/projects/pipelines/new.html.haml +++ b/app/views/projects/pipelines/new.html.haml @@ -10,7 +10,7 @@ = form_errors(@pipeline) .form-group.row .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 = dropdown_tag(params[:ref] || @project.default_branch, options: { toggle_class: 'js-branch-select wide git-revision-dropdown-toggle', |