diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-05 17:31:56 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-05 17:31:56 -0600 |
| commit | 03aeab857f0972e74910307f1a5954353eb70a28 (patch) | |
| tree | b0b6243ee40684a949cff440bb56dcad7eec8674 /config/initializers | |
| parent | f441770e50621ac59a7b022ee2127964935b2b8d (diff) | |
| parent | f6adb409fd8f4bf42c1da54cc1e7e42886612c14 (diff) | |
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-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') |