diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-03-12 10:43:13 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-03-12 10:43:13 +0000 |
| commit | 06a226a1c0e2c46f2ebea0257148d5f46742855c (patch) | |
| tree | bc8ff9599d0c88a7accae5429dc9dff49e749ab6 /lib/gitlab | |
| parent | d47449e957217791da2d4878360eb5db12ebfa06 (diff) | |
| download | gitlab-ce-06a226a1c0e2c46f2ebea0257148d5f46742855c.tar.gz | |
Fix code and wiki search results when filename is non-ASCII
Previously, we only handled non-ASCII file contents, but the name itself can be
non-ASCII.
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/search_results.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb index 757ef71b95a..1e45d074e0a 100644 --- a/lib/gitlab/search_results.rb +++ b/lib/gitlab/search_results.rb @@ -7,8 +7,8 @@ module Gitlab def initialize(opts = {}) @id = opts.fetch(:id, nil) - @filename = opts.fetch(:filename, nil) - @basename = opts.fetch(:basename, nil) + @filename = encode_utf8(opts.fetch(:filename, nil)) + @basename = encode_utf8(opts.fetch(:basename, nil)) @ref = opts.fetch(:ref, nil) @startline = opts.fetch(:startline, nil) @data = encode_utf8(opts.fetch(:data, nil)) |