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 /config | |
| 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 'config')
| -rw-r--r-- | config/routes.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index e059f5830f5..4b38dede7b4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -435,7 +435,7 @@ Gitlab::Application.routes.draw do member do # tree viewer logs get 'logs_tree', constraints: { id: Gitlab::Regex.git_reference_regex } - get 'logs_tree/:path' => 'refs#logs_tree', as: :logs_file, constraints: { + get 'logs_tree/*path' => 'refs#logs_tree', as: :logs_file, constraints: { id: Gitlab::Regex.git_reference_regex, path: /.*/ } |