summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-10-27 10:13:35 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-10-27 10:13:35 +0000
commite8ae58a7c189407375b3f575b7aa8fb17a1e4f99 (patch)
tree027bb4d3f911b7a07c7552f142d9b3fad32e9318 /lib
parent51b27ab58055b65e14e68b19604e4823389adb73 (diff)
downloadgitlab-ce-e8ae58a7c189407375b3f575b7aa8fb17a1e4f99.tar.gz
Add latest changes from gitlab-org/security/gitlab@14-4-stable-ee
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/import_export/project/import_export.yml3
-rw-r--r--lib/gitlab/import_export/project/relation_factory.rb5
2 files changed, 8 insertions, 0 deletions
diff --git a/lib/gitlab/import_export/project/import_export.yml b/lib/gitlab/import_export/project/import_export.yml
index 86fd11cc336..c962e0f677b 100644
--- a/lib/gitlab/import_export/project/import_export.yml
+++ b/lib/gitlab/import_export/project/import_export.yml
@@ -328,6 +328,7 @@ excluded_attributes:
- :services
- :exported_protected_branches
- :repository_size_limit
+ - :external_webhook_token
namespaces:
- :runners_token
- :runners_token_encrypted
@@ -536,6 +537,8 @@ excluded_attributes:
system_note_metadata:
- :description_version_id
- :note_id
+ pipeline_schedules:
+ - :active
methods:
notes:
- :type
diff --git a/lib/gitlab/import_export/project/relation_factory.rb b/lib/gitlab/import_export/project/relation_factory.rb
index 102fcedd2fc..888a5a10f2c 100644
--- a/lib/gitlab/import_export/project/relation_factory.rb
+++ b/lib/gitlab/import_export/project/relation_factory.rb
@@ -84,6 +84,7 @@ module Gitlab
when :'Ci::Pipeline' then setup_pipeline
when *BUILD_MODELS then setup_build
when :issues then setup_issue
+ when :'Ci::PipelineSchedule' then setup_pipeline_schedule
end
update_project_references
@@ -143,6 +144,10 @@ module Gitlab
@relation_hash['relative_position'] = compute_relative_position
end
+ def setup_pipeline_schedule
+ @relation_hash['active'] = false
+ end
+
def compute_relative_position
return unless max_relative_position