diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-08-18 01:43:17 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-08-18 01:43:17 +0900 |
| commit | d6acd8ec2f0c60ef6c380c23b679af9df2c5a1ac (patch) | |
| tree | 77e83454eac18b1a05f48437056da5b69633d520 | |
| parent | ec34b2d051c16a351387fbaedb5542654810b8a5 (diff) | |
| download | gitlab-ce-fix/sm/34805-get-back-validates-uniqueness-1.tar.gz | |
Add validate: false. Add validates uniqueness.fix/sm/34805-get-back-validates-uniqueness-1
| -rw-r--r-- | app/models/ci/pipeline_schedule.rb | 2 | ||||
| -rw-r--r-- | app/models/ci/pipeline_schedule_variable.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/models/ci/pipeline_schedule.rb b/app/models/ci/pipeline_schedule.rb index 085eeeae157..e7e02587759 100644 --- a/app/models/ci/pipeline_schedule.rb +++ b/app/models/ci/pipeline_schedule.rb @@ -9,7 +9,7 @@ module Ci belongs_to :owner, class_name: 'User' has_one :last_pipeline, -> { order(id: :desc) }, class_name: 'Ci::Pipeline' has_many :pipelines - has_many :variables, class_name: 'Ci::PipelineScheduleVariable' + has_many :variables, class_name: 'Ci::PipelineScheduleVariable', validate: false validates :cron, unless: :importing?, cron: true, presence: { unless: :importing? } validates :cron_timezone, cron_timezone: true, presence: { unless: :importing? } diff --git a/app/models/ci/pipeline_schedule_variable.rb b/app/models/ci/pipeline_schedule_variable.rb index 1ff177616e8..ee5b8733fac 100644 --- a/app/models/ci/pipeline_schedule_variable.rb +++ b/app/models/ci/pipeline_schedule_variable.rb @@ -4,5 +4,7 @@ module Ci include HasVariable belongs_to :pipeline_schedule + + validates :key, uniqueness: { scope: :pipeline_schedule_id } end end |