Merge commit '15fd712464' into kb_migration

config/initializers/content_security_policy.rb

@@ -3,7 +3,7 @@
 # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
 
 def host_to_url(str)
-  "http#{Rails.configuration.x.use_https ? 's' : ''}://#{str}" unless str.blank?
+  "http#{Rails.configuration.x.use_https ? 's' : ''}://#{str}" if str.present?
 end
 
 base_host = Rails.configuration.x.web_domain

config/initializers/paperclip.rb

@@ -7,7 +7,7 @@ Paperclip.interpolates :filename do |attachment, style|
   if style == :original
     attachment.original_filename
   else
-    [basename(attachment, style), extension(attachment, style)].delete_if(&:blank?).join('.')
+    [basename(attachment, style), extension(attachment, style)].compact_blank!.join('.')
   end
 end