Merge branch 'master' into fix_whisper

config/initializers/100-logster.rb

@@ -87,5 +87,6 @@ RailsMultisite::ConnectionManagement.each_connection do
 end
 
 if Rails.configuration.multisite
-  Rails.logger.instance_variable_get(:@chained).first.formatter = RailsMultisite::Formatter.new
+  chained = Rails.logger.instance_variable_get(:@chained)
+  chained && chained.first.formatter = RailsMultisite::Formatter.new
 end

config/locales/server.en.yml

@@ -1286,8 +1286,9 @@ en:
     allow_animated_thumbnails: "Generates animated thumbnails of animated gifs."
     default_avatars: "URLs to avatars that will be used by default for new users until they change them."
     automatically_download_gravatars: "Download Gravatars for users upon account creation or email change."
-    digest_topics: "The maximum number of topics to display in the email summary."
+    digest_topics: "The maximum number of popular topics to display in the email summary."
     digest_posts: "The maximum number of popular posts to display in the email summary."
+    digest_other_topics: "The maximum number of topics to show in the 'New in topics and categories you follow' section of the email summary."
     digest_min_excerpt_length: "Minimum post excerpt in the email summary, in characters."
     delete_digest_email_after_days: "Suppress summary emails for users not seen on the site for more than (n) days."
     digest_suppress_categories: "Suppress these categories from summary emails."

config/site_settings.yml

@@ -588,6 +588,7 @@ email:
     default: 5
     min: 1
   digest_posts: 3
+  digest_other_topics: 5
   delete_digest_email_after_days: 365
   digest_suppress_categories:
     type: category_list
@@ -669,7 +670,7 @@ email:
   reset_bounce_score_after_days: 30
   attachment_content_type_blacklist:
     type: list
-    default: "pkcs7"
+    default: "pkcs7|x-vcard"
   attachment_filename_blacklist:
     type: list
     default: "smime.p7s|signature.asc"