diff options
author | Shinya Maeda <shinya@gitlab.com> | 2017-07-13 21:17:47 +0900 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2017-07-13 21:17:47 +0900 |
commit | b038bcf710b499c204dffed6ae9eb3bc92757b20 (patch) | |
tree | d4f9620ce468b2d21a8f01848e037abce850f34b | |
parent | 3c197e74827b99a524a70f05fb4e955a036172b5 (diff) | |
download | gitlab-ce-b038bcf710b499c204dffed6ae9eb3bc92757b20.tar.gz |
Remove trigger_schedule_attributes and factory :ci_trigger_for_trigger_schedulefix/sm/32032-remove-the-rest-of-trigger_schedule-related-codes
-rw-r--r-- | app/controllers/projects/triggers_controller.rb | 3 | ||||
-rw-r--r-- | spec/factories/ci/triggers.rb | 7 |
2 files changed, 1 insertions, 9 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 diff --git a/spec/factories/ci/triggers.rb b/spec/factories/ci/triggers.rb index c3a29d8bf04..40c4663c6d8 100644 --- a/spec/factories/ci/triggers.rb +++ b/spec/factories/ci/triggers.rb @@ -2,13 +2,6 @@ FactoryGirl.define do factory :ci_trigger_without_token, class: Ci::Trigger do factory :ci_trigger do sequence(:token) { |n| "token#{n}" } - - factory :ci_trigger_for_trigger_schedule do - token { SecureRandom.hex(15) } - owner factory: :user - project factory: :project - ref 'master' - end end end end |