diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-10-08 12:38:19 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-10-08 12:38:19 +0000 |
| commit | 6d7b9cf210d72df5ba2da757b51d4c3cb31081dd (patch) | |
| tree | 221d1dfed0dfae54392b12d189bdc1de12294634 /app/controllers/projects/jobs_controller.rb | |
| parent | ecbcda22d31737f343d2e2e79a698cb265340940 (diff) | |
| parent | 4899dfcafe55ca2935d699f85c13fc35a8e16545 (diff) | |
| download | gitlab-ce-6d7b9cf210d72df5ba2da757b51d4c3cb31081dd.tar.gz | |
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/controllers/projects/jobs_controller.rb')
| -rw-r--r-- | app/controllers/projects/jobs_controller.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb index 9c9bbe04947..3ecf94c008e 100644 --- a/app/controllers/projects/jobs_controller.rb +++ b/app/controllers/projects/jobs_controller.rb @@ -2,6 +2,7 @@ class Projects::JobsController < Projects::ApplicationController include SendFileUpload + include ContinueParams before_action :build, except: [:index, :cancel_all] before_action :authorize_read_build! @@ -107,7 +108,12 @@ class Projects::JobsController < Projects::ApplicationController return respond_422 unless @build.cancelable? @build.cancel - redirect_to build_path(@build) + + if continue_params + redirect_to continue_params[:to] + else + redirect_to builds_project_pipeline_path(@project, @build.pipeline.id) + end end def unschedule |