diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-11-26 23:04:22 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-11-30 03:57:05 +0000 |
| commit | 7b90034acd5aca95c0195eba58cf5cb47d0e53f3 (patch) | |
| tree | d1027a2fe729f758ae7744a70d4ccdfba557c999 /app | |
| parent | b204e93e04fb16b2d9f0df465f86abab3706328d (diff) | |
| download | gitlab-ce-7b90034acd5aca95c0195eba58cf5cb47d0e53f3.tar.gz | |
Merge branch 'sh-fix-hash-filename-handling' into 'master'
Fix handling of filenames with hash characters in tree view
Closes #54473
See merge request gitlab-org/gitlab-ce!23368
(cherry picked from commit 5d82035f623fd910c010c30b97112c46218430d4)
e8da70e6 Fix handling of filenames with hash characters in tree view
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/tree_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb index 78a11616d4c..e2879bfdcf1 100644 --- a/app/helpers/tree_helper.rb +++ b/app/helpers/tree_helper.rb @@ -37,13 +37,13 @@ module TreeHelper # Using Rails `*_path` methods can be slow, especially when generating # many paths, as with a repository tree that has thousands of items. def fast_project_blob_path(project, blob_path) - Addressable::URI.escape( + ActionDispatch::Journey::Router::Utils.escape_path( File.join(relative_url_root, project.path_with_namespace, 'blob', blob_path) ) end def fast_project_tree_path(project, tree_path) - Addressable::URI.escape( + ActionDispatch::Journey::Router::Utils.escape_path( File.join(relative_url_root, project.path_with_namespace, 'tree', tree_path) ) end |