Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-09 00:17:17 +00:00
parent 43a9a781a4 ff44b2e92d
commit 447d7e6127
206 changed files with 2401 additions and 737 deletions
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -101,4 +101,6 @@ Rails.application.configure do
    'X-Clacks-Overhead' => 'GNU Natalie Nguyen'

  }
+
+  config.x.otp_secret = ENV.fetch('OTP_SECRET')
 end