diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-10-11 17:04:31 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-10-11 17:04:31 +0300 |
| commit | 5c6cbfa6cbc6cb82ba20e615c27f98649265b4ce (patch) | |
| tree | e8e91e7201426324eb0e0e55dbee5099ca59e801 /CHANGELOG | |
| parent | e28623cc6e54fdcce8b4b8432c767c085a2b7bc0 (diff) | |
| parent | 1022456bb15d18b05c14fe344950fb75c7c69f48 (diff) | |
Merge branch 'atom-routes' into 'master'
Allow browsing branches that end with '.atom'
## What does this MR do?
1. Simplify the regex capture in the routing for the CommitsController
to not exclude the '.atom' suffix. That's a perfectly valid git
branch name, so we shouldn't blow up if we get it.
2. Because Rails now can't automatically detect the request format, add
some code to do so in `ExtractPath` when there is no path. This means
that, given branches 'foo' and 'foo.atom', the Atom feed for the
former is unroutable. To fix this: don't do that! Give the branches
different names!
## Why was this MR needed?
Creating a branch or tag name ending in '.atom' would cause some 500s on that repo.
## What are the relevant issue numbers?
Closes #21955. Related to !5994.
See merge request !6750
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 2095e4fc0fd..0c5955eb59a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -20,6 +20,7 @@ v 8.13.0 (unreleased) - Don't include archived projects when creating group milestones. !4940 (Jeroen Jacobs) - Add tag shortcut from the Commit page. !6543 - Keep refs for each deployment + - Allow browsing branches that end with '.atom' - Log LDAP lookup errors and don't swallow unrelated exceptions. !6103 (Markus Koller) - Add more tests for calendar contribution (ClemMakesApps) - Update Gitlab Shell to fix some problems with moving projects between storages |