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

Merge branch 'rails5-fix-46276' into 'master'

Browse source 
Rails5 fix format in uploads actions

Closes #46276

See merge request gitlab-org/gitlab-ce!19907
This commit is contained in:
Rémy Coutable 2018-06-19 08:36:57 +00:00
commit 719e0dc39e
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/controllers/concerns/uploads_actions.rb
View file

@ -1,9 +1,15 @@
module UploadsActions module UploadsActions
extend ActiveSupport::Concern
include Gitlab::Utils::StrongMemoize include Gitlab::Utils::StrongMemoize
include SendFileUpload include SendFileUpload
UPLOAD_MOUNTS = %w(avatar attachment file logo header_logo favicon).freeze UPLOAD_MOUNTS = %w(avatar attachment file logo header_logo favicon).freeze
included do
prepend_before_action :set_html_format, only: :show
end
def create def create
link_to_file = UploadService.new(model, params[:file], uploader_class).execute link_to_file = UploadService.new(model, params[:file], uploader_class).execute
@ -41,6 +47,13 @@ module UploadsActions
private private
# Explicitly set the format.
# Otherwise rails 5 will set it from a file extension.
# See https://github.com/rails/rails/commit/84e8accd6fb83031e4c27e44925d7596655285f7#diff-2b8f2fbb113b55ca8e16001c393da8f1
def set_html_format
request.format = :html
end
def uploader_class def uploader_class
raise NotImplementedError raise NotImplementedError
end end

5
changelogs/unreleased/rails5-fix-46276.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Rails5 fix format in uploads actions
merge_request: 19907
author: Jasper Maes
type: fixed