diff options
| author | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-01-09 00:50:54 +0100 |
|---|---|---|
| committer | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-01-09 00:50:54 +0100 |
| commit | 85e8acedaf1d4e51335c59a0efa2f95576a4fde3 (patch) | |
| tree | 9b21d76626568158cf746e2a7eb4853efe3aa0d5 /app/controllers/projects/runners_controller.rb | |
| parent | cdcade0dd4e748bcf0119b307c06993e0669f507 (diff) | |
| parent | bd50ecbad8c00e7c9ab5c60fa8bc839a8905b4ab (diff) | |
| download | gitlab-ce-move-project-dropdown.tar.gz | |
Resolved conflictsmove-project-dropdown
Diffstat (limited to 'app/controllers/projects/runners_controller.rb')
| -rw-r--r-- | app/controllers/projects/runners_controller.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/projects/runners_controller.rb b/app/controllers/projects/runners_controller.rb index 9f9773575a5..c950d0f7001 100644 --- a/app/controllers/projects/runners_controller.rb +++ b/app/controllers/projects/runners_controller.rb @@ -29,17 +29,17 @@ class Projects::RunnersController < Projects::ApplicationController def resume if Ci::UpdateRunnerService.new(@runner).update(active: true) - redirect_to runner_path(@runner), notice: 'Runner was successfully updated.' + redirect_to runners_path(@project), notice: 'Runner was successfully updated.' else - redirect_to runner_path(@runner), alert: 'Runner was not updated.' + redirect_to runners_path(@project), alert: 'Runner was not updated.' end end def pause if Ci::UpdateRunnerService.new(@runner).update(active: false) - redirect_to runner_path(@runner), notice: 'Runner was successfully updated.' + redirect_to runners_path(@project), notice: 'Runner was successfully updated.' else - redirect_to runner_path(@runner), alert: 'Runner was not updated.' + redirect_to runners_path(@project), alert: 'Runner was not updated.' end end |