summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-01-10 17:06:55 -0800
committerStan Hu <stanhu@gmail.com>2019-01-10 17:06:55 -0800
commit9bbb063f5a362f7e35b9d599bf6c72719a0a0fe7 (patch)
treee32d1799f3499a7a5c07574be47d30ceafb66e12
parent336070913cee4d88dc62faefc016b6d922d97df8 (diff)
downloadgitlab-ce-9bbb063f5a362f7e35b9d599bf6c72719a0a0fe7.tar.gz
Remove Webhooks from import/export help
We dropped Webhooks from import/export in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24121, but the online help still shows it's there.
-rw-r--r--app/views/projects/_export.html.haml3
-rw-r--r--doc/user/project/settings/import_export.md2
2 files changed, 3 insertions, 2 deletions
diff --git a/app/views/projects/_export.html.haml b/app/views/projects/_export.html.haml
index aa980da7e95..91deffe07c1 100644
--- a/app/views/projects/_export.html.haml
+++ b/app/views/projects/_export.html.haml
@@ -19,7 +19,7 @@
%ul
%li Project and wiki repositories
%li Project uploads
- %li Project configuration including web hooks and services
+ %li Project configuration, including services
%li Issues with comments, merge requests with diffs and comments, labels, milestones, snippets, and other project entities
%li LFS objects
%p
@@ -28,6 +28,7 @@
%li Job traces and artifacts
%li Container registry images
%li CI variables
+ %li Webhooks
%li Any encrypted tokens
%p
Once the exported file is ready, you will receive a notification email with a download link, or you can download it from this page.
diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md
index 3bbfa74f4b7..89008fd15b9 100644
--- a/doc/user/project/settings/import_export.md
+++ b/doc/user/project/settings/import_export.md
@@ -61,7 +61,7 @@ The following items will be exported:
- Project and wiki repositories
- Project uploads
-- Project configuration including web hooks and services
+- Project configuration, including services
- Issues with comments, merge requests with diffs and comments, labels, milestones, snippets,
and other project entities
- LFS objects