diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-07-14 14:50:34 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-07-14 14:50:34 +0000 |
| commit | c49517a0048f24e57f6d6ab2a5e80c8de132280d (patch) | |
| tree | b984c5f604b65cbf3c7424b16944eac63c0b85ed /CHANGELOG | |
| parent | 005ce32f7ca8743465f797f43eb47e1745a006e9 (diff) | |
| parent | 001c9aa3137e6648fe3994eca4237f9283d0ee6e (diff) | |
| download | gitlab-ce-c49517a0048f24e57f6d6ab2a5e80c8de132280d.tar.gz | |
Merge branch 'fix/persistent-import-data' into 'master'
Fix import_data being saved as a result of an invalid import_url
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19479
Seem that in all cases the `import_url` was an empty string. The `import_url` is now validated correctly and no longer creates the `import_data`even if it fails validation. <= Should cover cases 1, 3, and 4 of https://gitlab.com/gitlab-org/gitlab-ce/issues/19479#note_13005276
Also, it now rescues from all exceptions when importing from a URL, so we make sure the `import_status` is failed after that. Covers case 2 of https://gitlab.com/gitlab-org/gitlab-ce/issues/19479#note_13005276
See merge request !5206
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 6a061a86abe..6b24b2c5b32 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -100,7 +100,10 @@ v 8.9.6 - Overwrite Host and X-Forwarded-Host headers in NGINX !5213 - Keeps issue number when importing from Gitlab.com -v 8.9.6 (unreleased) +v 8.9.7 (unreleased) + - Fix import_data wrongly saved as a result of an invalid import_url + +v 8.9.6 - Fix importing of events under notes for GitLab projects v 8.9.5 |