diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 21:08:22 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 21:08:22 +0300 |
| commit | 123c68a7cf788ace140e57e478a12c5b7ac893ae (patch) | |
| tree | b36e565ecd895ee46c1713f3734308cfce0e6ba9 /lib/gitlab/import_export/relation_factory.rb | |
| parent | 862d225ca0d8eb452e56b8fe5a0109aac796e872 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/import_export/relation_factory.rb')
| -rw-r--r-- | lib/gitlab/import_export/relation_factory.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb index 5d907300d68..1438a7db001 100644 --- a/lib/gitlab/import_export/relation_factory.rb +++ b/lib/gitlab/import_export/relation_factory.rb @@ -38,12 +38,12 @@ module Gitlab IMPORTED_OBJECT_MAX_RETRIES = 5.freeze - EXISTING_OBJECT_CHECK = %i[milestone milestones label labels project_label project_labels group_label group_labels project_feature merge_request ProjectCiCdSetting].freeze + EXISTING_OBJECT_CHECK = %i[milestone milestones label labels project_label project_labels group_label group_labels project_feature merge_request ProjectCiCdSetting container_expiration_policy].freeze TOKEN_RESET_MODELS = %i[Project Namespace Ci::Trigger Ci::Build Ci::Runner ProjectHook].freeze # This represents all relations that have unique key on `project_id` - UNIQUE_RELATIONS = %i[project_feature ProjectCiCdSetting].freeze + UNIQUE_RELATIONS = %i[project_feature ProjectCiCdSetting container_expiration_policy].freeze def self.create(*args) new(*args).create |