Commit 0be3ada9 authored by Shinya Maeda's avatar Shinya Maeda

Fix static analysis

parent d8fa256f
...@@ -20,16 +20,16 @@ module CarrierWave ...@@ -20,16 +20,16 @@ module CarrierWave
end end
def store(new_file) def store(new_file)
if new_file.is_a?(self.class) if new_file.is_a?(self.class) # rubocop:disable Gitlab/LineBreakAroundConditionalBlock
new_file.copy_to(path) new_file.copy_to(path)
else else
fog_file = new_file.to_file fog_file = new_file.to_file
@content_type ||= new_file.content_type @content_type ||= new_file.content_type
@file = directory.files.create({ @file = directory.files.create({
:body => fog_file ? fog_file : new_file.read, :body => fog_file ? fog_file : new_file.read, # rubocop:disable Gitlab/HashSyntax
:content_type => @content_type, :content_type => @content_type, # rubocop:disable Gitlab/HashSyntax
:key => path, :key => path, # rubocop:disable Gitlab/HashSyntax
:public => @uploader.fog_public :public => @uploader.fog_public # rubocop:disable Gitlab/HashSyntax
}.merge(@uploader.fog_attributes)) }.merge(@uploader.fog_attributes))
fog_file.close if fog_file && !fog_file.closed? fog_file.close if fog_file && !fog_file.closed?
end end
......
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