Merge branch 'sh-fix-import-export-text-page' into 'master'

Remove Webhooks from import/export help

See merge request gitlab-org/gitlab-ce!24314

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.

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