diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-08-11 13:03:09 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-08-11 13:03:09 +0000 |
| commit | a081b842f9b4e0205cf08656403e6bd9bf0d367f (patch) | |
| tree | 9e0adad05236453ee98f6e739b4103a68e27cc41 /CHANGELOG | |
| parent | 2fee83376788574824192ff2ac417edc9adfadb4 (diff) | |
| parent | 68cea38e94886e69099a3faa0d1e2fbde2e71899 (diff) | |
| download | gitlab-ce-a081b842f9b4e0205cf08656403e6bd9bf0d367f.tar.gz | |
Merge branch '10772-fix-urlencoded-branchname' into 'master'
Fix front-end for branches that happen to contain urlencoding escape characters (e.g. %)
_Originally opened at !3574 by @ewiltshi._
- - -
Adding a branch with a name like "foo%20bar" (via command-line) and setting it to the project's default branch causes the project "show" page to 404 for that project. "assign_ref_vars" unescapes the branch name ("foo%20bar" ==> "foo bar"), making GitLab look for a non-existent branch.
This MR adds logic to skip the URL unescaping step in "assign_ref_vars".
Fixes #10772, #14992, #15304.
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5770
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 4e7af8db8c5..b94d3b79914 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,7 @@ v 8.11.0 (unreleased) - Fix rename `add_users_into_project` and `projects_ids`. !20512 (herminiotorres) - Fix the title of the toggle dropdown button. !5515 (herminiotorres) - Improve diff performance by eliminating redundant checks for text blobs + - Ensure that branch names containing escapable characters (e.g. %20) aren't unescaped indiscriminately. !5770 (ewiltshi) - Convert switch icon into icon font (ClemMakesApps) - API: Endpoints for enabling and disabling deploy keys - API: List access requests, request access, approve, and deny access requests to a project or a group. !4833 |