Fix Style/TrailingCommaInArguments cop (#30003)

mastodon · Apr 19, 2024 · c7384ad · c7384ad
1 parent b6f04ae
commit c7384ad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -241,13 +241,6 @@ Style/StringConcatenation:
   Exclude:
     - 'config/initializers/paperclip.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInArguments:
-  Exclude:
-    - 'config/initializers/paperclip.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyleForMultiline.
 # SupportedStylesForMultiline: comma, consistent_comma, no_comma

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
@@ -73,7 +73,7 @@
   if ENV.has_key?('S3_ENDPOINT')
     Paperclip::Attachment.default_options[:s3_options].merge!(
       endpoint: ENV['S3_ENDPOINT'],
-      force_path_style: ENV['S3_OVERRIDE_PATH_STYLE'] != 'true',
+      force_path_style: ENV['S3_OVERRIDE_PATH_STYLE'] != 'true'
     )
 
     Paperclip::Attachment.default_options[:url] = ':s3_path_url'
@@ -159,7 +159,7 @@ def copy_to_local_file(style, local_dest_path)
   Paperclip::Attachment.default_options.merge!(
     storage: :filesystem,
     path: File.join(ENV.fetch('PAPERCLIP_ROOT_PATH', File.join(':rails_root', 'public', 'system')), ':prefix_path:class', ':attachment', ':id_partition', ':style', ':filename'),
-    url: ENV.fetch('PAPERCLIP_ROOT_URL', '/system') + '/:prefix_url:class/:attachment/:id_partition/:style/:filename',
+    url: ENV.fetch('PAPERCLIP_ROOT_URL', '/system') + '/:prefix_url:class/:attachment/:id_partition/:style/:filename'
   )
 end