Skip to content
Snippets Groups Projects
Commit 8d51ce42 authored by Naoki Kosaka's avatar Naoki Kosaka Committed by Eugen Rochko
Browse files

Fix enforce HTTPS in production. (#6180)

parent 06636c6e
No related branches found
No related tags found
No related merge requests found
# 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')
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment