Commit 60b91b46 authored by Grzegorz Bizon's avatar Grzegorz Bizon

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
parents e90c382c b038bcf7
...@@ -69,8 +69,7 @@ class Projects::TriggersController < Projects::ApplicationController ...@@ -69,8 +69,7 @@ class Projects::TriggersController < Projects::ApplicationController
def trigger_params def trigger_params
params.require(:trigger).permit( params.require(:trigger).permit(
:description, :description
trigger_schedule_attributes: [:id, :active, :cron, :cron_timezone, :ref]
) )
end end
end end
...@@ -2,13 +2,6 @@ FactoryGirl.define do ...@@ -2,13 +2,6 @@ FactoryGirl.define do
factory :ci_trigger_without_token, class: Ci::Trigger do factory :ci_trigger_without_token, class: Ci::Trigger do
factory :ci_trigger do factory :ci_trigger do
sequence(:token) { |n| "token#{n}" } 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 end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment