diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-14 14:02:27 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-14 14:02:27 +0000 |
commit | 60b91b46f289b1e4ac72827cf01370b2604622ac (patch) | |
tree | 9c710efdbb551d0752498820e452d964f6d87d75 /app | |
parent | e90c382c25fbccf885e8345d614dc4d6fc9909b6 (diff) | |
parent | b038bcf710b499c204dffed6ae9eb3bc92757b20 (diff) | |
download | gitlab-ce-60b91b46f289b1e4ac72827cf01370b2604622ac.tar.gz |
Merge branch 'fix/sm/32032-remove-the-rest-of-trigger_schedule-related-codes' into 'master'
Remove the rest of `trigger_schedule` related codes
Closes #32032
See merge request !12839
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/projects/triggers_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/projects/triggers_controller.rb b/app/controllers/projects/triggers_controller.rb index a5b17fa65ea..e04145dd0b3 100644 --- a/app/controllers/projects/triggers_controller.rb +++ b/app/controllers/projects/triggers_controller.rb @@ -69,8 +69,7 @@ class Projects::TriggersController < Projects::ApplicationController def trigger_params params.require(:trigger).permit( - :description, - trigger_schedule_attributes: [:id, :active, :cron, :cron_timezone, :ref] + :description ) end end |