From e35bc5f4bc36ceaeb8bc1e48e5edf8724849e028 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Sat, 26 May 2018 01:41:51 +0900 Subject: Fix rubocop namespace --- config/initializers/carrierwave_monkey_patch.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'config') diff --git a/config/initializers/carrierwave_monkey_patch.rb b/config/initializers/carrierwave_monkey_patch.rb index bfd0f1c3d36..d6925d5f8dc 100644 --- a/config/initializers/carrierwave_monkey_patch.rb +++ b/config/initializers/carrierwave_monkey_patch.rb @@ -24,16 +24,16 @@ module CarrierWave end def store(new_file) - if new_file.is_a?(self.class) # rubocop:disable Gitlab/LineBreakAroundConditionalBlock + 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 Gitlab/HashSyntax - :content_type => @content_type, # rubocop:disable Gitlab/HashSyntax,Gitlab/ModuleWithInstanceVariables - :key => path, # rubocop:disable Gitlab/HashSyntax - :public => @uploader.fog_public # rubocop:disable Gitlab/HashSyntax,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 -- cgit v1.2.1