summaryrefslogtreecommitdiff
path: root/lib/gitlab
diff options
context:
space:
mode:
authorSteve Azzopardi <steveazz@outlook.com>2018-11-20 10:11:42 +0100
committerSteve Azzopardi <steveazz@outlook.com>2018-11-20 10:11:42 +0100
commit282a5b4c84b5b68a86f55a17e674d16b9a1a17cb (patch)
treebaca3d1acd16800fd1a33a2df5434aba75bed431 /lib/gitlab
parenta0c86637c138a17a8ae136e4698cf192b5949c36 (diff)
parente35eeaf8afce6842e490f1386d3cdaaaf5f0126c (diff)
downloadgitlab-ce-282a5b4c84b5b68a86f55a17e674d16b9a1a17cb.tar.gz
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Diffstat (limited to 'lib/gitlab')
-rw-r--r--lib/gitlab/import_export/import_export.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml
index 9790818ecaf..b40eac3de9a 100644
--- a/lib/gitlab/import_export/import_export.yml
+++ b/lib/gitlab/import_export/import_export.yml
@@ -154,6 +154,8 @@ excluded_attributes:
- :encrypted_token_iv
- :encrypted_url
- :encrypted_url_iv
+ services:
+ - :template
methods:
labels: