Merge remote-tracking branch 'origin/master' into merge-upstream

Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb
2018-02-04 16:36:19 -06:00
parent 530fcc1c14 38e0133e1b
commit a6fb1c58ee
35 changed files with 506 additions and 31 deletions
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@@ -19,6 +19,7 @@ module Admin
      min_invite_role
      activity_api_enabled
      peers_api_enabled
+      show_known_fediverse_at_about_page
    ).freeze

    BOOLEAN_SETTINGS = %w(
@@ -28,6 +29,7 @@ module Admin
      show_staff_badge
      activity_api_enabled
      peers_api_enabled
+      show_known_fediverse_at_about_page
    ).freeze

    UPLOAD_SETTINGS = %w(