summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-08 12:58:30 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-08 13:06:54 +0100
commitb53769aedc30d40730ba73928c6dbd61cd358ef0 (patch)
treebc786b2a78b89e8c7b763e756ecfc85e17383e96
parent1b5302f8e7050c5c4cd4e7d4cc63be3cd3fbbcb5 (diff)
downloadgitlab-ce-b53769aedc30d40730ba73928c6dbd61cd358ef0.tar.gz
Change "Cancel all" to "Cancel running"
-rw-r--r--app/views/projects/builds/index.html.haml5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/views/projects/builds/index.html.haml b/app/views/projects/builds/index.html.haml
index dab7164153f..742676305a9 100644
--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
@@ -3,10 +3,10 @@
.project-issuable-filter
.controls
- - if @ci_project && current_user && can?(current_user, :manage_builds, @project)
+ - if @ci_project && can?(current_user, :manage_builds, @project)
.pull-left.hidden-xs
- if @all_builds.running_or_pending.any?
- = link_to 'Cancel all', cancel_all_namespace_project_builds_path(@project.namespace, @project), data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
+ = link_to 'Cancel running', cancel_all_namespace_project_builds_path(@project.namespace, @project), data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
%ul.center-top-menu
%li{class: ('active' if @scope.nil?)}
@@ -50,4 +50,3 @@
= render 'projects/commit_statuses/commit_status', commit_status: build, commit_sha: true, stage: true, allow_retry: true
= paginate @builds, theme: 'gitlab'
-