diff options
author | Nick Thomas <nick@gitlab.com> | 2018-02-28 16:07:55 +0300 |
---|---|---|
committer | Ian Baum <ibaum@gitlab.com> | 2018-03-07 01:20:31 +0300 |
commit | b67bac5699a8b48f2406ef7d480af5b40db1294f (patch) | |
tree | d2a3679f4252a4e60c979e683af5d83cb24fa256 /lib | |
parent | d77353b8b12345c1d10e427f2fc2e5a3ba03eef3 (diff) |
Merge branch '43531-500-error-searching-wiki-incompatible-character-encodings-utf-8-and-ascii-8bit' into 'master'
Resolve "500 Error searching wiki: incompatible character encodings: UTF-8 and ASCII-8BIT"
Closes #43531
See merge request gitlab-org/gitlab-ce!17413
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/search_results.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb index 5a5ae7f19d4..781783f4d97 100644 --- a/lib/gitlab/search_results.rb +++ b/lib/gitlab/search_results.rb @@ -1,6 +1,8 @@ module Gitlab class SearchResults class FoundBlob + include EncodingHelper + attr_reader :id, :filename, :basename, :ref, :startline, :data, :project_id def initialize(opts = {}) @@ -9,7 +11,7 @@ module Gitlab @basename = opts.fetch(:basename, nil) @ref = opts.fetch(:ref, nil) @startline = opts.fetch(:startline, nil) - @data = opts.fetch(:data, nil) + @data = encode_utf8(opts.fetch(:data, nil)) @per_page = opts.fetch(:per_page, 20) @project_id = opts.fetch(:project_id, nil) end |