diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-11-07 15:24:28 +0300 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-11-07 15:24:28 +0300 |
| commit | b982a44abb53835276739d77f7fedc69d36c3dab (patch) | |
| tree | 3f917e5f73be29bbba50a32d787fd6e1a61e450a /lib/gitlab/import_export | |
| parent | bbdb0cf05141cdf9931e2aa673bf7a2ce5db0078 (diff) | |
| parent | 68a9229502de26c191dbd56738828736876217f6 (diff) | |
Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into 38464-k8s-apps
Diffstat (limited to 'lib/gitlab/import_export')
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 2 | ||||
| -rw-r--r-- | lib/gitlab/import_export/relation_factory.rb | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index a2b735957a3..263599831bf 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -54,8 +54,6 @@ project_tree: - :auto_devops - :triggers - :pipeline_schedules - - clusters: - - :application_helm - :services - :hooks - protected_branches: diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb index 04d2fe94c2f..2b34ceb5831 100644 --- a/lib/gitlab/import_export/relation_factory.rb +++ b/lib/gitlab/import_export/relation_factory.rb @@ -8,8 +8,6 @@ module Gitlab triggers: 'Ci::Trigger', pipeline_schedules: 'Ci::PipelineSchedule', builds: 'Ci::Build', - clusters: 'Clusters::Cluster', - application_helm: 'Clusters::Applications::Helm', hooks: 'ProjectHook', merge_access_levels: 'ProtectedBranch::MergeAccessLevel', push_access_levels: 'ProtectedBranch::PushAccessLevel', |