summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2017-07-14 14:02:27 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2017-07-14 14:02:27 +0000
commit60b91b46f289b1e4ac72827cf01370b2604622ac (patch)
tree9c710efdbb551d0752498820e452d964f6d87d75
parente90c382c25fbccf885e8345d614dc4d6fc9909b6 (diff)
parentb038bcf710b499c204dffed6ae9eb3bc92757b20 (diff)
downloadgitlab-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
-rw-r--r--app/controllers/projects/triggers_controller.rb3
-rw-r--r--spec/factories/ci/triggers.rb7
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