diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-06-29 21:17:04 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-06-29 21:17:04 +0800 |
| commit | 24a1f0d833941a30b91813f36d184d3e7c3f7425 (patch) | |
| tree | b85b6f44bca3bd9977caa5f6e0c673c25d6af09e /app | |
| parent | c6bed065339ff33c069225be7dc90268629d228e (diff) | |
| parent | adf792f1f7288e8c10bf01efa0b78e30243889fe (diff) | |
| download | gitlab-ce-24a1f0d833941a30b91813f36d184d3e7c3f7425.tar.gz | |
Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline
* upstream/master:
Make membership required for create_user_by_membership
Fix sa
use go instead of let proc
Fixed typo and hash alighment
Improve description_for
Fix static analysis
IMprove access_matchers
Remove author. Replace Result to Got.
Fix static analysys
Resolve static analysis
Add changelog. Add AccessMatchersForController
Use authorize_update_pipeline_schedule in PipelineSchedulesController
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/pipeline_schedules_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/pipeline_schedules_controller.rb b/app/controllers/projects/pipeline_schedules_controller.rb index ef4f083b98f..60db179277b 100644 --- a/app/controllers/projects/pipeline_schedules_controller.rb +++ b/app/controllers/projects/pipeline_schedules_controller.rb @@ -1,6 +1,7 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController before_action :authorize_read_pipeline_schedule! - before_action :authorize_create_pipeline_schedule!, only: [:new, :create, :edit, :take_ownership, :update] + 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] |