diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-02-15 20:46:13 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-02-15 20:46:13 +0000 |
| commit | 681e5f77f6e33694b996b71c8ae554f4446448ae (patch) | |
| tree | 0a036f4c5fc5160c23d18eaffe49ca82a56ce0f6 /app/views | |
| parent | 238781a68582958cd1f690c87e8f58364e7493d7 (diff) | |
| parent | 05f66d1342db228c1a659b4c58e15c890b522261 (diff) | |
| download | gitlab-ce-681e5f77f6e33694b996b71c8ae554f4446448ae.tar.gz | |
Merge branch 'winh-new-modal-component' into 'master'
Add new modal Vue component
See merge request gitlab-org/gitlab-ce!17108
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/jobs/index.html.haml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/views/admin/jobs/index.html.haml b/app/views/admin/jobs/index.html.haml index a01676d82a8..4e3e2f7a475 100644 --- a/app/views/admin/jobs/index.html.haml +++ b/app/views/admin/jobs/index.html.haml @@ -7,10 +7,9 @@ - build_path_proc = ->(scope) { admin_jobs_path(scope: scope) } = render "shared/builds/tabs", build_path_proc: build_path_proc, all_builds: @all_builds, scope: @scope - .nav-controls - - if @all_builds.running_or_pending.any? - #stop-jobs-modal - + - if @all_builds.running_or_pending.any? + #stop-jobs-modal + .nav-controls %button#stop-jobs-button.btn.btn-danger{ data: { toggle: 'modal', target: '#stop-jobs-modal', url: cancel_all_admin_jobs_path } } |