kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'blackst0ne-rails5-fix-specs-with-text-plain-charset-utf-8' into 'master'

Browse source 
Resolve "[Rails5] Fix specs with "text/plain; charset=utf-8""

Closes #47378

See merge request gitlab-org/gitlab-ce!19462
This commit is contained in:
Rémy Coutable 2018-06-06 07:39:56 +00:00
commit e0ca6ccbc9
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/workhorse_helper.rb
View file

@ -6,7 +6,7 @@ module WorkhorseHelper
headers.store(*Gitlab::Workhorse.send_git_blob(repository, blob))
headers['Content-Disposition'] = 'inline'
headers['Content-Type'] = safe_content_type(blob)
head :ok # 'render nothing: true' messes up the Content-Type
render plain: ""
end
# Send a Git diff through Workhorse