diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-07-01 19:30:01 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-07-05 18:36:19 +0900 |
| commit | 395491d4356c800eeda48808fbd2d0402248da07 (patch) | |
| tree | 0f47d01f9d0a1dcecfdf065cb4c6c55d70a19200 | |
| parent | b6f41544d8a9ca4b13045b8f9d063367be17404f (diff) | |
| download | gitlab-ce-395491d4356c800eeda48808fbd2d0402248da07.tar.gz | |
Exclude schedule variables from Import/Export feature
| -rw-r--r-- | app/models/ci/pipeline_schedule_variable.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/models/ci/pipeline_schedule_variable.rb b/app/models/ci/pipeline_schedule_variable.rb index 6c9c8d990f9..ee5b8733fac 100644 --- a/app/models/ci/pipeline_schedule_variable.rb +++ b/app/models/ci/pipeline_schedule_variable.rb @@ -5,6 +5,6 @@ module Ci belongs_to :pipeline_schedule - validates :key, uniqueness: { scope: :pipeline_schedule_id }, presence: { unless: :importing? } + validates :key, uniqueness: { scope: :pipeline_schedule_id } end end diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index 2d443aa731f..1860352c96d 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -42,8 +42,7 @@ project_tree: - :stages - :statuses - :triggers - - pipeline_schedules: - - :variables + - :pipeline_schedules - :services - :hooks - protected_branches: |