diff options
| author | Saito <saitowu@gmail.com> | 2012-09-11 19:18:14 +0800 |
|---|---|---|
| committer | Saito <saitowu@gmail.com> | 2012-09-11 19:18:14 +0800 |
| commit | 96d4f22e53a6176715f9557fb0707cb166a1dd80 (patch) | |
| tree | cc5124d3a2c88df24df0261f846e5d2859c80ad8 /app/helpers/tree_helper.rb | |
| parent | 1c08cb404d5e874ae7d79a540e493bbf1f0d3061 (diff) | |
| download | gitlab-ce-96d4f22e53a6176715f9557fb0707cb166a1dd80.tar.gz | |
tree view need use ascii-8bit, file name need be utf8.
Diffstat (limited to 'app/helpers/tree_helper.rb')
| -rw-r--r-- | app/helpers/tree_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb index c51ee84a25e..a5d5c742230 100644 --- a/app/helpers/tree_helper.rb +++ b/app/helpers/tree_helper.rb @@ -18,7 +18,8 @@ module TreeHelper end def tree_full_path(content) - if params[:path] + content.name.force_encoding('utf-8') + if params[:path] File.join(params[:path], content.name) else content.name |