Commit e0ca6ccb authored by Rémy Coutable's avatar Rémy Coutable

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

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

Closes #47378

See merge request gitlab-org/gitlab-ce!19462
parents af07c490 04e795d1
...@@ -6,7 +6,7 @@ module WorkhorseHelper ...@@ -6,7 +6,7 @@ module WorkhorseHelper
headers.store(*Gitlab::Workhorse.send_git_blob(repository, blob)) headers.store(*Gitlab::Workhorse.send_git_blob(repository, blob))
headers['Content-Disposition'] = 'inline' headers['Content-Disposition'] = 'inline'
headers['Content-Type'] = safe_content_type(blob) headers['Content-Type'] = safe_content_type(blob)
head :ok # 'render nothing: true' messes up the Content-Type render plain: ""
end end
# Send a Git diff through Workhorse # Send a Git diff through Workhorse
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment