Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream

lib/mastodon/redis_configuration.rb

@@ -17,15 +17,15 @@ class Mastodon::RedisConfiguration
 
   def cache
     @cache ||= setup_config(prefix: 'CACHE_')
-               .merge({
-                 namespace: 'cache',
-                 expires_in: 10.minutes,
-                 connect_timeout: 5,
-                 pool: {
-                   size: Sidekiq.server? ? Sidekiq.default_configuration[:concurrency] : Integer(ENV['MAX_THREADS'] || 5),
-                   timeout: 5,
-                 },
-               })
+      .merge({
+        namespace: 'cache',
+        expires_in: 10.minutes,
+        connect_timeout: 5,
+        pool: {
+          size: Sidekiq.server? ? Sidekiq.default_configuration[:concurrency] : Integer(ENV['MAX_THREADS'] || 5),
+          timeout: 5,
+        },
+      })
   end
 
   private

lib/paperclip/attachment_extensions.rb

@@ -24,7 +24,7 @@ module Paperclip
 
       unadapted_file = @queued_for_write[name]
       @queued_for_write[name] = Paperclip.io_adapters
-                                         .for(@queued_for_write[name], @options[:adapter_options])
+        .for(@queued_for_write[name], @options[:adapter_options])
       unadapted_file.close if unadapted_file.respond_to?(:close)
       @queued_for_write[name]
     rescue Paperclip::Errors::NotIdentifiedByImageMagickError => e

lib/paperclip/color_extractor.rb

@@ -221,10 +221,10 @@ module Paperclip
       total_frequencies = frequencies.sum.to_f
 
       frequencies.map.with_index { |f, i| [f / total_frequencies, hex_values[i]] }
-                 .sort_by { |r| -r[0] }
-                 .reject { |r| r[1].size == 8 && r[1].end_with?('00') }
-                 .map { |r| ColorDiff::Color::RGB.new(*r[1][0..5].scan(/../).map { |c| c.to_i(16) }) }
-                 .slice(0, quantity)
+        .sort_by { |r| -r[0] }
+        .reject { |r| r[1].size == 8 && r[1].end_with?('00') }
+        .map { |r| ColorDiff::Color::RGB.new(*r[1][0..5].scan(/../).map { |c| c.to_i(16) }) }
+        .slice(0, quantity)
     end
 
     def rgb_to_hex(rgb)