Browse Source

Fix enforce HTTPS in production. (#6180)

master
Naoki Kosaka 6 years ago
committed by Eugen Rochko
parent
commit
8d51ce4290
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      config/initializers/session_store.rb
  2. +1
    -1
      spec/rails_helper.rb

+ 1
- 1
config/initializers/session_store.rb View File

@@ -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')

+ 1
- 1
spec/rails_helper.rb View File

@@ -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



Loading…
Cancel
Save