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
This commit is contained in:
Grzegorz Bizon 2017-07-14 14:02:27 +00:00
commit 60b91b46f2
2 changed files with 1 additions and 9 deletions

View File

@ -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

View File

@ -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