diff options
| author | Francisco Javier López <fjlopez@gitlab.com> | 2018-12-19 12:51:07 +0100 |
|---|---|---|
| committer | Francisco Javier López <fjlopez@gitlab.com> | 2018-12-19 13:05:44 +0100 |
| commit | 33e595567115f508ff069ee4927e10eae49e87a1 (patch) | |
| tree | 0d841ec2a2d0c60a3093eef4975db640a5aed863 /app/helpers/workhorse_helper.rb | |
| parent | ffef28ccd6d37ade2c3ee3ca46679749f9cf09aa (diff) | |
| download | gitlab-ce-33e595567115f508ff069ee4927e10eae49e87a1.tar.gz | |
Removing workhorse_set_content_type feature flag
Removing workhorse_set_content_type feature flag introduced in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22667
Diffstat (limited to 'app/helpers/workhorse_helper.rb')
| -rw-r--r-- | app/helpers/workhorse_helper.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/helpers/workhorse_helper.rb b/app/helpers/workhorse_helper.rb index e9fc39e451b..bb5b1555dc4 100644 --- a/app/helpers/workhorse_helper.rb +++ b/app/helpers/workhorse_helper.rb @@ -7,8 +7,7 @@ module WorkhorseHelper def send_git_blob(repository, blob, inline: true) headers.store(*Gitlab::Workhorse.send_git_blob(repository, blob)) - headers['Content-Disposition'] = content_disposition(blob, inline) - headers['Content-Type'] = safe_content_type(blob) + headers['Content-Disposition'] = inline ? 'inline' : 'attachment' # If enabled, this will override the values set above workhorse_set_content_type! @@ -47,6 +46,6 @@ module WorkhorseHelper end def workhorse_set_content_type! - headers[Gitlab::Workhorse::DETECT_HEADER] = "true" if Feature.enabled?(:workhorse_set_content_type) + headers[Gitlab::Workhorse::DETECT_HEADER] = "true" end end |