diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-01-03 15:58:37 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-01-03 15:58:37 +0000 |
| commit | 1915873e5955db02ca9b3cd81892676e615a279d (patch) | |
| tree | 5f6c1759843e6c2b4024e6c12e21f58c55f627b3 | |
| parent | 9db22922dd028ba7baf4059a00d8ed965e6865ff (diff) | |
| parent | 2341692c49b02bb3d5bde3d9c0fe59d51a16c4e1 (diff) | |
| download | gitlab-ce-50521-block-emojis-and-symbol-characters-from-user-s-full-names.tar.gz | |
Merge branch 'sh-drop-webhooks-project-export' into 'master'50521-block-emojis-and-symbol-characters-from-user-s-full-names
Drop Webhooks from project import/export config
Closes #53513
See merge request gitlab-org/gitlab-ce!24121
| -rw-r--r-- | changelogs/unreleased/sh-drop-webhooks-project-export.yml | 5 | ||||
| -rw-r--r-- | doc/user/project/settings/import_export.md | 1 | ||||
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 7 |
3 files changed, 6 insertions, 7 deletions
diff --git a/changelogs/unreleased/sh-drop-webhooks-project-export.yml b/changelogs/unreleased/sh-drop-webhooks-project-export.yml new file mode 100644 index 00000000000..217373bce66 --- /dev/null +++ b/changelogs/unreleased/sh-drop-webhooks-project-export.yml @@ -0,0 +1,5 @@ +--- +title: Drop Webhooks from project import/export config +merge_request: 24121 +author: +type: fixed diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md index cb68c9318bc..3bbfa74f4b7 100644 --- a/doc/user/project/settings/import_export.md +++ b/doc/user/project/settings/import_export.md @@ -71,6 +71,7 @@ The following items will NOT be exported: - Build traces and artifacts - Container registry images - CI variables +- Webhooks - Any encrypted tokens ## Exporting a project and its data diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index 3cd8ede830c..25cdd5ab121 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -63,7 +63,6 @@ project_tree: - :triggers - :pipeline_schedules - :services - - :hooks - protected_branches: - :merge_access_levels - :push_access_levels @@ -156,12 +155,6 @@ excluded_attributes: - :reference - :reference_html - :epic_id - hooks: - - :token - - :encrypted_token - - :encrypted_token_iv - - :encrypted_url - - :encrypted_url_iv runners: - :token - :token_encrypted |