diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-05-26 01:41:51 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-05-28 14:34:37 +0900 |
| commit | e35bc5f4bc36ceaeb8bc1e48e5edf8724849e028 (patch) | |
| tree | 134bc3b2b1b7efeacb33ac8b49a1133839e306d2 /config | |
| parent | 39d804b151e5958be5ef140920cbee2f2cd1c78c (diff) | |
| download | gitlab-ce-e35bc5f4bc36ceaeb8bc1e48e5edf8724849e028.tar.gz | |
Fix rubocop namespace
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/carrierwave_monkey_patch.rb | 10 |
1 files changed, 5 insertions, 5 deletions
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 |