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/about_controller.rb
+++ b/app/controllers/about_controller.rb
@@ -36,7 +36,7 @@ class AboutController < ApplicationController

  def initial_state_params
    {
-      settings: {},
+      settings: { known_fediverse: Setting.show_known_fediverse_at_about_page },
      token: current_session&.token,
    }
  end