diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-06 10:39:56 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-06 10:39:56 +0300 |
| commit | e0ca6ccbc926ebe3ad9e90bc993b9fd20fd37acb (patch) | |
| tree | 0aa0a484c0c85e6c3e8fd4bd1b6add9092dead27 /app/helpers | |
| parent | af07c490b2a32ed4c88e387d1133e7882f79abc5 (diff) | |
| parent | 04e795d1d5aea36c6c5a73989c54c204d08e6ac5 (diff) | |
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
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/workhorse_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/workhorse_helper.rb b/app/helpers/workhorse_helper.rb index 9f78b80c71d..a82271ce0ee 100644 --- a/app/helpers/workhorse_helper.rb +++ b/app/helpers/workhorse_helper.rb @@ -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 |