diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-26 15:08:56 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-26 15:08:56 +0000 |
| commit | 17ab40ca089e1aef61a83f77ab6df62a72f6ce06 (patch) | |
| tree | 8eb149293eee90ec2750b6ac5e46a111a806424e /lib/gitlab/tree_summary.rb | |
| parent | 66d4203791a01fdedf668a78818a229ea2c07aad (diff) | |
| download | gitlab-ce-17ab40ca089e1aef61a83f77ab6df62a72f6ce06.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/tree_summary.rb')
| -rw-r--r-- | lib/gitlab/tree_summary.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/tree_summary.rb b/lib/gitlab/tree_summary.rb index 76018cb23c4..5df53b5adde 100644 --- a/lib/gitlab/tree_summary.rb +++ b/lib/gitlab/tree_summary.rb @@ -69,7 +69,7 @@ module Gitlab end def entry_path(entry) - File.join(*[path, entry[:file_name]].compact) + File.join(*[path, entry[:file_name]].compact).force_encoding(Encoding::ASCII_8BIT) end def build_entry(entry) |