diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-05 22:17:12 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-05 22:17:12 +0000 |
| commit | f6adb409fd8f4bf42c1da54cc1e7e42886612c14 (patch) | |
| tree | 01ab66d37a57fbe59546f6376e16c8398b5198d8 /config/initializers | |
| parent | f41b33eb0177b23bd72fede7df94af43da0c7c6b (diff) | |
| parent | 10f6793fd0af3690a37c868b7bb4418418dc3a7a (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/session_store.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index ef61543a8..3dc0edd6f 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,3 +1,3 @@ # Be sure to restart your server when you modify this file. -Rails.application.config.session_store :cookie_store, key: '_mastodon_session', secure: (ENV['LOCAL_HTTPS'] == 'true') +Rails.application.config.session_store :cookie_store, key: '_mastodon_session', secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true') |