summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-01-30 15:24:25 +0000
committerDouwe Maan <douwe@gitlab.com>2017-01-30 15:24:25 +0000
commit4468104f3550456481b45d1b09202ed6732a1810 (patch)
tree1d0227d013016e041e747cf45df285915d658403 /doc
parent7f27a35e1ee1eaf9b8846cc24d8b4d472008a648 (diff)
parent017a5068f60c0a7fb058422c5d8d2740f36084a4 (diff)
downloadgitlab-ce-4468104f3550456481b45d1b09202ed6732a1810.tar.gz
Merge branch 'fix/import-encrypt-atts' into 'master'
Ignore encrypted attributes in Import/Export Closes #24458 See merge request !8739
Diffstat (limited to 'doc')
-rw-r--r--doc/user/project/settings/import_export.md6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md
index dfc762fe1d3..cb1c1a84f8c 100644
--- a/doc/user/project/settings/import_export.md
+++ b/doc/user/project/settings/import_export.md
@@ -22,7 +22,8 @@ with all their related data and be moved into a new GitLab instance.
| GitLab version | Import/Export version |
| -------- | -------- |
-| 8.13.0 to current | 0.1.5 |
+| 8.16.2 to current | 0.1.6 |
+| 8.13.0 | 0.1.5 |
| 8.12.0 | 0.1.4 |
| 8.10.3 | 0.1.3 |
| 8.10.0 | 0.1.2 |
@@ -47,6 +48,9 @@ The following items will NOT be exported:
- Build traces and artifacts
- LFS objects
+- Container registry images
+- CI variables
+- Any encrypted tokens
## Exporting a project and its data