diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-01-11 21:18:46 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-01-14 23:59:56 +0000 |
| commit | e6845245e80eafc744996886f41b9c376ab72ec4 (patch) | |
| tree | b9ef855ac7396a0cc7a95a13f99b76a0306cd7c1 | |
| parent | 740f64c77b5621356be5fe8ff48aa08b860d9c0b (diff) | |
| download | gitlab-ce-e6845245e80eafc744996886f41b9c376ab72ec4.tar.gz | |
Merge branch 'sh-fix-import-export-text-page' into 'master'
Remove Webhooks from import/export help
See merge request gitlab-org/gitlab-ce!24314
(cherry picked from commit 962c8e511084514ce5115b37b0c4fb11e51da84a)
9bbb063f Remove Webhooks from import/export help
| -rw-r--r-- | app/views/projects/_export.html.haml | 3 | ||||
| -rw-r--r-- | doc/user/project/settings/import_export.md | 2 |
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 |