diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-02-04 19:12:47 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-02-04 19:12:47 +0300 |
| commit | ac923b4fb40da88d6c7907d08d4584d5d4a560e2 (patch) | |
| tree | 79050d2d630b681d1ed97448e497be87c4905328 /CHANGELOG | |
| parent | dfe12649f64bcac76b270a96be04285bbe0c2aa2 (diff) | |
| parent | 5dc77d7577bf19586f6cd756678d0c2660e7f868 (diff) | |
Merge branch 'fix/atom-url-issue' into 'master'
Fix atom url issue on projects
This MR adds prevents a project to have a path ending in .atom that conflicts with the feed
and
Adds a migration to migrate old .atom projects to a different path
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3699
See merge request !2651
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 330872e504d..b7e8822fdd6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -26,6 +26,7 @@ v 8.5.0 (unreleased) - Fix API to keep request parameters in Link header (Michael Potthoff) - Deprecate API "merge_request/:merge_request_id/comments". Use "merge_requests/:merge_request_id/notes" instead - Deprecate API "merge_request/:merge_request_id/...". Use "merge_requests/:merge_request_id/..." instead + - Prevent parse error when name of project ends with .atom and prevent path issues - Mark inline difference between old and new paths when a file is renamed - Support Akismet spam checking for creation of issues via API (Stan Hu) - Improve UI consistency between projects and groups lists |