Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-06-27 10:23:16 +0300
committerShinya Maeda <shinya@gitlab.com>2017-07-05 12:38:25 +0300
commitc5e16d524ace247578ce77c423dc6ad8b20df5cc (patch)
treed962bb8dea8dafdd28b173a0e8215d3b925e5a08 /app/controllers/projects/pipeline_schedules_controller.rb
parent08ed07cf96be6b988965b14a20397f66a2be9c24 (diff)
Define authorize_update_pipeline_schedule and apply to :edit, :take_ownership, :update
Diffstat (limited to 'app/controllers/projects/pipeline_schedules_controller.rb')
-rw-r--r--app/controllers/projects/pipeline_schedules_controller.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/app/controllers/projects/pipeline_schedules_controller.rb b/app/controllers/projects/pipeline_schedules_controller.rb
index 3f395bd9cea..86c9628d917 100644
--- a/app/controllers/projects/pipeline_schedules_controller.rb
+++ b/app/controllers/projects/pipeline_schedules_controller.rb
@@ -1,11 +1,11 @@
class Projects::PipelineSchedulesController < Projects::ApplicationController
+ before_action :schedule, only: [:edit, :update, :destroy, :take_ownership]
+
before_action :authorize_read_pipeline_schedule!
before_action :authorize_create_pipeline_schedule!, only: [:new, :create]
before_action :authorize_update_pipeline_schedule!, only: [:edit, :take_ownership, :update]
before_action :authorize_admin_pipeline_schedule!, only: [:destroy]
- before_action :schedule, only: [:edit, :update, :destroy, :take_ownership]
-
def index
@scope = params[:scope]
@all_schedules = PipelineSchedulesFinder.new(@project).execute
@@ -33,8 +33,6 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController
end
def update
- return access_denied! unless can?(current_user, :update_pipeline_schedule, schedule)
-
if Ci::CreatePipelineScheduleService
.new(@project, current_user, schedule_params).update(schedule)
redirect_to namespace_project_pipeline_schedules_path(@project.namespace.becomes(Namespace), @project)
@@ -72,4 +70,8 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController
.permit(:description, :cron, :cron_timezone, :ref, :active,
variables_attributes: [:id, :key, :value, :_destroy] )
end
+
+ def authorize_update_pipeline_schedule!
+ return access_denied! unless can?(current_user, :update_pipeline_schedule, schedule)
+ end
end