diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-10-08 15:38:19 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-10-08 15:38:19 +0300 |
| commit | 6d7b9cf210d72df5ba2da757b51d4c3cb31081dd (patch) | |
| tree | 221d1dfed0dfae54392b12d189bdc1de12294634 /app/views/projects/ci | |
| parent | ecbcda22d31737f343d2e2e79a698cb265340940 (diff) | |
| parent | 4899dfcafe55ca2935d699f85c13fc35a8e16545 (diff) | |
Merge branch 'Fix-pipeline-redirect' into 'master'
Redirect to the pipeline builds page when a build is canceled
Closes #39161
See merge request gitlab-org/gitlab-ce!21595
Diffstat (limited to 'app/views/projects/ci')
| -rw-r--r-- | app/views/projects/ci/builds/_build.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index 59c297c46a5..95828626bd9 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -101,7 +101,7 @@ = sprite_icon('download') - if can?(current_user, :update_build, job) - if job.active? - = link_to cancel_project_job_path(job.project, job, return_to: request.original_url), method: :post, title: 'Cancel', class: 'btn btn-build' do + = link_to cancel_project_job_path(job.project, job, continue: { to: request.fullpath }), method: :post, title: 'Cancel', class: 'btn btn-build' do = icon('remove', class: 'cred') - elsif job.scheduled? .btn-group |