Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
0766f870
Commit
0766f870
authored
Jun 30, 2018
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Delete monkey patch
parent
02a911be
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
69 deletions
+0
-69
config/initializers/carrierwave_monkey_patch.rb
config/initializers/carrierwave_monkey_patch.rb
+0
-69
No files found.
config/initializers/carrierwave_monkey_patch.rb
deleted
100644 → 0
View file @
02a911be
# This fixes the problem https://gitlab.com/gitlab-org/gitlab-ce/issues/46182 that carrierwave eagerly loads upoloading files into memory
# There is an PR https://github.com/carrierwaveuploader/carrierwave/pull/2314 which has the identical change.
module
CarrierWave
module
Storage
class
Fog
<
Abstract
class
File
module
MonkeyPatch
##
# Read content of file from service
#
# === Returns
#
# [String] contents of file
def
read
file_body
=
file
.
body
return
if
file_body
.
nil?
return
file_body
unless
file_body
.
is_a?
(
::
File
)
# Fog::Storage::XXX::File#body could return the source file which was upoloaded to the remote server.
read_source_file
(
file_body
)
if
::
File
.
exist?
(
file_body
.
path
)
# If the source file doesn't exist, the remote content is read
@file
=
nil
# rubocop:disable Gitlab/ModuleWithInstanceVariables
file
.
body
end
##
# Write file to service
#
# === Returns
#
# [Boolean] true on success or raises error
def
store
(
new_file
)
if
new_file
.
is_a?
(
self
.
class
)
# rubocop:disable Cop/LineBreakAroundConditionalBlock
new_file
.
copy_to
(
path
)
else
fog_file
=
new_file
.
to_file
@content_type
||=
new_file
.
content_type
# rubocop:disable Gitlab/ModuleWithInstanceVariables
@file
=
directory
.
files
.
create
({
# rubocop:disable Gitlab/ModuleWithInstanceVariables
:body
=>
fog_file
?
fog_file
:
new_file
.
read
,
# rubocop:disable Style/HashSyntax
:content_type
=>
@content_type
,
# rubocop:disable Style/HashSyntax,Gitlab/ModuleWithInstanceVariables
:key
=>
path
,
# rubocop:disable Style/HashSyntax
:public
=>
@uploader
.
fog_public
# rubocop:disable Style/HashSyntax,Gitlab/ModuleWithInstanceVariables
}.
merge
(
@uploader
.
fog_attributes
))
# rubocop:disable Gitlab/ModuleWithInstanceVariables
fog_file
.
close
if
fog_file
&&
!
fog_file
.
closed?
end
true
end
private
def
read_source_file
(
file_body
)
return
unless
::
File
.
exist?
(
file_body
.
path
)
begin
file_body
=
::
File
.
open
(
file_body
.
path
)
if
file_body
.
closed?
# Reopen if it's already closed
file_body
.
read
ensure
file_body
.
close
end
end
end
prepend
MonkeyPatch
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment