Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-05-25 08:23:04 +0300
committerShinya Maeda <shinya@gitlab.com>2018-05-28 08:34:37 +0300
commit0be3ada9e5479f2e2e26ac50fd45d055ada7bfeb (patch)
tree755a753fa5ea716afa85d78b652ba1ea2872d056 /config
parentd8fa256fa49f5582cad844138a7d72ac78f90fc2 (diff)
Fix static analysis
Diffstat (limited to 'config')
-rw-r--r--config/initializers/carrierwave_monkey_patch.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/config/initializers/carrierwave_monkey_patch.rb b/config/initializers/carrierwave_monkey_patch.rb
index cbd055fb673..d81e5607b45 100644
--- a/config/initializers/carrierwave_monkey_patch.rb
+++ b/config/initializers/carrierwave_monkey_patch.rb
@@ -20,16 +20,16 @@ module CarrierWave
end
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)
else
fog_file = new_file.to_file
@content_type ||= new_file.content_type
@file = directory.files.create({
- :body => fog_file ? fog_file : new_file.read,
- :content_type => @content_type,
- :key => path,
- :public => @uploader.fog_public
+ :body => fog_file ? fog_file : new_file.read, # rubocop:disable Gitlab/HashSyntax
+ :content_type => @content_type, # rubocop:disable Gitlab/HashSyntax
+ :key => path, # rubocop:disable Gitlab/HashSyntax
+ :public => @uploader.fog_public # rubocop:disable Gitlab/HashSyntax
}.merge(@uploader.fog_attributes))
fog_file.close if fog_file && !fog_file.closed?
end