diff options
| author | Naoki Kosaka <n.k@mail.yukimochi.net> | 2018-01-06 04:04:22 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-01-05 20:04:22 +0100 |
| commit | 8d51ce429094d43a91d61c9cb0c0dc7b1e6bd2de (patch) | |
| tree | 427e7d7b7cdc8283fa1f3d4dfcd34ef54ebd29b2 | |
| parent | 06636c6eca636d7cacc3d743487b2a9618585c34 (diff) | |
Fix enforce HTTPS in production. (#6180)
| -rw-r--r-- | config/initializers/session_store.rb | 2 | ||||
| -rw-r--r-- | spec/rails_helper.rb | 2 |
2 files changed, 2 insertions, 2 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') diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 4f7399505..67c6b9205 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -46,7 +46,7 @@ RSpec.configure do |config| config.include ActiveSupport::Testing::TimeHelpers config.before :each, type: :feature do - https = ENV['LOCAL_HTTPS'] == 'true' + https = Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true' Capybara.app_host = "http#{https ? 's' : ''}://#{ENV.fetch('LOCAL_DOMAIN')}" end |