diff options
author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-02-03 17:25:26 +0000 |
---|---|---|
committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-02-03 17:25:26 +0000 |
commit | 1af3f3b673be8f85b37d455b101954e62c2a3add (patch) | |
tree | 56f09bef2ca41964fae3efaf4f15be7fe1640ba4 /app/views/projects/ci/pipelines | |
parent | 67c8526033241f6bd190fa16622970b3919e6dbd (diff) | |
parent | bd8f2b15b3d5267075a626ce86f3a06cc650fcbf (diff) | |
download | gitlab-ce-1af3f3b673be8f85b37d455b101954e62c2a3add.tar.gz |
Merge branch 'master' into jej-pages-picked-from-ee
Diffstat (limited to 'app/views/projects/ci/pipelines')
-rw-r--r-- | app/views/projects/ci/pipelines/_pipeline.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml index 818a70f38f1..cdab1e1b1a6 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -15,7 +15,7 @@ - else %span.api.monospace API - if pipeline.latest? - %span.label.label-success.has-tooltip{ title: 'Latest build for this branch' } latest + %span.label.label-success.has-tooltip{ title: 'Latest job for this branch' } latest - if pipeline.triggered? %span.label.label-primary triggered - if pipeline.yaml_errors.present? @@ -78,7 +78,7 @@ .btn-group.inline - if actions.any? .btn-group - %button.dropdown-toggle.btn.btn-default.has-tooltip.js-pipeline-dropdown-manual-actions{ type: 'button', title: 'Manual build', data: { toggle: 'dropdown', placement: 'top' }, 'aria-label' => 'Manual build' } + %button.dropdown-toggle.btn.btn-default.has-tooltip.js-pipeline-dropdown-manual-actions{ type: 'button', title: 'Manual job', data: { toggle: 'dropdown', placement: 'top' }, 'aria-label' => 'Manual job' } = custom_icon('icon_play') = icon('caret-down', 'aria-hidden' => 'true') %ul.dropdown-menu.dropdown-menu-align-right |