diff options
| author | Dylan Griffith <dyl.griffith@gmail.com> | 2018-05-04 14:02:37 +0200 |
|---|---|---|
| committer | Dylan Griffith <dyl.griffith@gmail.com> | 2018-05-07 08:54:08 +0200 |
| commit | 3762b910eb413475d0c5568efefdadcfb2e9724f (patch) | |
| tree | 813339f72d6eb5f727b6a9582141d3f73c084215 | |
| parent | 4ec95dc404291c975b10ddfca1be6ae423886b03 (diff) | |
| download | gitlab-ce-3762b910eb413475d0c5568efefdadcfb2e9724f.tar.gz | |
Rename set_runner -> runner in runner controllers
| -rw-r--r-- | app/controllers/groups/runners_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/projects/runners_controller.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/groups/runners_controller.rb b/app/controllers/groups/runners_controller.rb index 3a9d1da3c47..152966e0fbc 100644 --- a/app/controllers/groups/runners_controller.rb +++ b/app/controllers/groups/runners_controller.rb @@ -1,6 +1,6 @@ class Groups::RunnersController < Groups::ApplicationController before_action :authorize_admin_pipeline! - before_action :set_runner, only: [:edit, :update, :destroy, :pause, :resume, :show] + before_action :runner, only: [:edit, :update, :destroy, :pause, :resume, :show] def show render 'shared/runners/show' @@ -41,7 +41,7 @@ class Groups::RunnersController < Groups::ApplicationController private - def set_runner + def runner @runner ||= @group.runners.find(params[:id]) end diff --git a/app/controllers/projects/runners_controller.rb b/app/controllers/projects/runners_controller.rb index 656b014aa8a..bef94cea989 100644 --- a/app/controllers/projects/runners_controller.rb +++ b/app/controllers/projects/runners_controller.rb @@ -1,6 +1,6 @@ class Projects::RunnersController < Projects::ApplicationController before_action :authorize_admin_build! - before_action :set_runner, only: [:edit, :update, :destroy, :pause, :resume, :show] + before_action :runner, only: [:edit, :update, :destroy, :pause, :resume, :show] layout 'project_settings' @@ -61,7 +61,7 @@ class Projects::RunnersController < Projects::ApplicationController protected - def set_runner + def runner @runner ||= project.runners.find(params[:id]) end |