diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-05-13 01:01:40 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-05-13 01:01:40 +0300 |
| commit | 5186f6e3bd541ffa13f9f907067c638790b9ebfe (patch) | |
| tree | 85e383080ca5fb6e91e405ac987295e0635dbb2f /app/views/admin | |
| parent | 850234ebd2bad3f79179146abd3db81741a48434 (diff) | |
| parent | 18fdbf0a035b6feec3b576c01ee1a2f3a95e4305 (diff) | |
Merge branch 'default-scope-on-builds-page' into 'master'
Fix a description for default scope on builds
Should be "**All* builds (from this project)" for the {project,admin}
builds page without scope.
Fix a regression on !2243 (#4240).
See merge request !4118
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/builds/index.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/builds/index.html.haml b/app/views/admin/builds/index.html.haml index 804d7851bdb..ed24757087b 100644 --- a/app/views/admin/builds/index.html.haml +++ b/app/views/admin/builds/index.html.haml @@ -20,7 +20,7 @@ = link_to 'Cancel all', cancel_all_admin_builds_path, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post .row-content-block.second-block - #{(@scope || 'running').capitalize} builds + #{(@scope || 'all').capitalize} builds %ul.content-list - if @builds.blank? |