diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-06-14 00:31:45 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-14 00:31:45 +0300 |
| commit | 6dbca80c46093443e69f3faace6f1967570b15fa (patch) | |
| tree | d3e351e4ed25c347978f33176c729c0495b7de74 /app/controllers/projects/runners_controller.rb | |
| parent | 8c058e8563c287817b81a9a122ceeb5a69f6b221 (diff) | |
| parent | 4a8ae77ebac46545fa4811ea60bf53d1e81f10fc (diff) | |
| download | gitlab-ce-remove-comment-toggle.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into remove-comment-toggleremove-comment-toggle
Diffstat (limited to 'app/controllers/projects/runners_controller.rb')
| -rw-r--r-- | app/controllers/projects/runners_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/runners_controller.rb b/app/controllers/projects/runners_controller.rb index 0dd2d6a99be..0b4fa572501 100644 --- a/app/controllers/projects/runners_controller.rb +++ b/app/controllers/projects/runners_controller.rb @@ -20,7 +20,7 @@ class Projects::RunnersController < Projects::ApplicationController if @runner.update_attributes(runner_params) redirect_to runner_path(@runner), notice: 'Runner was successfully updated.' else - redirect_to runner_path(@runner), alert: 'Runner was not updated.' + render 'edit' end end @@ -64,6 +64,6 @@ class Projects::RunnersController < Projects::ApplicationController end def runner_params - params.require(:runner).permit(:description, :tag_list, :active) + params.require(:runner).permit(Ci::Runner::FORM_EDITABLE) end end |