Merge tag 'v2.8.0' into instance_only_statuses

2019-04-13 23:47:24 +02:00
parent 153385e508 6afab2587d
commit 546581d2ba
689 changed files with 25483 additions and 9047 deletions
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@ -49,7 +49,8 @@ class Settings::PreferencesController < Settings::BaseController
      :setting_theme,
      :setting_hide_network,
      :setting_aggregate_reblogs,
-      notification_emails: %i(follow follow_request reblog favourite mention digest report),
+      :setting_show_application,
+      notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account),
      interactions: %i(must_be_follower must_be_following)
    )
  end