diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-08-21 11:43:10 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-08-21 11:43:10 +0000 |
| commit | 0fa4e2ff9748ae395c6e9038d6db52f4ef0dd2de (patch) | |
| tree | 805ec5a68b08e866f80fe26af706af72f5e926bf | |
| parent | fa293df2b7f3f63b72640dbc5e70b539cbd106b1 (diff) | |
| parent | d6acd8ec2f0c60ef6c380c23b679af9df2c5a1ac (diff) | |
| download | gitlab-ce-0fa4e2ff9748ae395c6e9038d6db52f4ef0dd2de.tar.gz | |
Merge branch 'fix/sm/34805-get-back-validates-uniqueness-1' into 'master'
Add `validates :key, uniqueness: { scope: :pipeline_schedule_id }` in `Ci::PipelineScheduleVariable` model
See merge request !13641
| -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 |