diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-01-03 06:14:04 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-01-03 06:22:14 -0800 |
| commit | 2341692c49b02bb3d5bde3d9c0fe59d51a16c4e1 (patch) | |
| tree | 879768c5be452fb5ba2f1ea557d5a300b7cf7bcd | |
| parent | 420442c5036b08652a758179d893bf8fe2b798ef (diff) | |
| download | gitlab-ce-2341692c49b02bb3d5bde3d9c0fe59d51a16c4e1.tar.gz | |
Drop Webhooks from project import/export config
Webhook URLs were recently encrypted in the database via
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21645, and as a
result they are no longer exported. When an exported project with
Webhooks is imported, the project import service will fail with
`URI::InvalidURIError: bad URI(is not URI?)` due to a blank URL.
We avoid this by disabling the export/import of Webhooks in
the first place.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53513
| -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 |