summaryrefslogtreecommitdiff
path: root/doc/administration
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-09-07 14:28:25 +0000
committerDouwe Maan <douwe@gitlab.com>2018-09-07 14:28:25 +0000
commit1f765ce9ea25b45cd702c25ccb762eacceb9a4ae (patch)
tree1dc0b5b6141b386d4e6fedce1ffd519e21a60e21 /doc/administration
parent766bb7fb8ed94b438aac47c0197c96cfff6c789f (diff)
parent1499d1764dbea4234002ee17fe46c0d6d6772067 (diff)
downloadgitlab-ce-1f765ce9ea25b45cd702c25ccb762eacceb9a4ae.tar.gz
Merge branch '48778-remove-old-storage-logic-from-import-export' into 'master'
Resolve "Remove old storage logic from Import/Export" Closes #51144, #50109, #48778, and #51079 See merge request gitlab-org/gitlab-ce!21409
Diffstat (limited to 'doc/administration')
-rw-r--r--doc/administration/raketasks/project_import_export.md7
1 files changed, 1 insertions, 6 deletions
diff --git a/doc/administration/raketasks/project_import_export.md b/doc/administration/raketasks/project_import_export.md
index 7bd765a35e0..f43bba0a7a7 100644
--- a/doc/administration/raketasks/project_import_export.md
+++ b/doc/administration/raketasks/project_import_export.md
@@ -9,6 +9,7 @@
> application settings (`/admin/application_settings`) under 'Import sources'.
> - The exports are stored in a temporary [shared directory][tmp] and are deleted
> every 24 hours by a specific worker.
+> - ImportExport can use object storage automatically starting from GitLab 11.3
The GitLab Import/Export version can be checked by using:
@@ -30,12 +31,6 @@ sudo gitlab-rake gitlab:import_export:data
bundle exec rake gitlab:import_export:data RAILS_ENV=production
```
-In order to enable Object Storage on the Export, you can use the [feature flag][feature-flags]:
-
-```
-import_export_object_storage
-```
-
[ce-3050]: https://gitlab.com/gitlab-org/gitlab-ce/issues/3050
[feature-flags]: https://docs.gitlab.com/ee/api/features.html
[tmp]: ../../development/shared_files.md