summaryrefslogtreecommitdiff
path: root/app/views/projects/jobs
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2017-10-06 17:07:05 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2017-10-06 17:07:05 +0000
commit4299df0439d01f190aa7e27a2d49344844596e6a (patch)
tree42aff84257ce44f3f2b52fa75db9dc0ffaf2e604 /app/views/projects/jobs
parentfb70fadaca6d2ce30730e9a6c995ad8e4f0526e3 (diff)
parentee2c13d78d2289c87218068c0231f1386d7da2eb (diff)
downloadgitlab-ce-4299df0439d01f190aa7e27a2d49344844596e6a.tar.gz
Merge branch 'add-1000-plus-counters-for-jobs-page' into 'master'
Add 1000 plus counters for jobs page See merge request gitlab-org/gitlab-ce!14507
Diffstat (limited to 'app/views/projects/jobs')
-rw-r--r--app/views/projects/jobs/index.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/jobs/index.html.haml b/app/views/projects/jobs/index.html.haml
index 4a238b99b58..9963cc93633 100644
--- a/app/views/projects/jobs/index.html.haml
+++ b/app/views/projects/jobs/index.html.haml
@@ -8,7 +8,7 @@
.nav-controls
- if can?(current_user, :update_build, @project)
- - if @all_builds.running_or_pending.any?
+ - if @all_builds.running_or_pending.limit(1).any?
= link_to 'Cancel running', cancel_all_project_jobs_path(@project),
data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post