diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-28 18:46:36 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-28 18:46:36 +0300 |
| commit | 822ba95f75858a904d20779b0d27d7f5aee2d7b7 (patch) | |
| tree | 1c45797ef303d65b41f6511ba9ef4f6afcc84237 /CHANGELOG | |
| parent | 8140c6828905345ea510b23ee09e53f01a74f97d (diff) | |
| parent | ef0055b52d85bb9f38c36303d2291ab2a29d0780 (diff) | |
Merge branch 'fix-commit-data-url-generation' into 'master'
Fix bug where commit data would not appear in some subdirectories
Fix issue where commit data would not show up in some subdirectories due to escaped slashes. For example:
https://gitlab.common-lisp.net/ecl/ecl/tree/develop/src/gc (now patched with fix)
The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76ed) caused slashes in a tree to be escaped automatically. Using a wildcard glob in the route prevents this behavior.
* Closes #1478, #1459
* Closes https://github.com/gitlabhq/gitlabhq/issues/9037
See merge request !581
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 33cf1c4378e..909f9972712 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -19,6 +19,8 @@ v 7.11.0 (unreleased) - Include commit comments in MR from a forked project. - Fix adding new group members from admin area - Add default project and snippet visibility settings to the admin web UI. + - + - Fix bug where commit data would not appear in some subdirectories (Stan Hu) - Fix bug where Slack service channel was not saved in admin template settings. (Stan Hu) - Move snippets UI to fluid layout - Improve UI for sidebar. Increase separation between navigation and content |