Merge branch 'master' into minitest-config

# Conflicts:
#	lib/tasks/dev.rake
This commit is contained in:
Artur Beljajev 2017-11-12 22:35:38 +02:00
commit 8237bcceb0
2 changed files with 9 additions and 1 deletions

View file

@ -129,3 +129,5 @@ payments_lhv_seller_private: 'kaupmees_priv.pem'
payments_lhv_seller_account: 'testvpos' payments_lhv_seller_account: 'testvpos'
user_session_timeout: '3600' # 1 hour user_session_timeout: '3600' # 1 hour
secure_session_cookies: 'false' # true|false
same_site_session_cookies: 'false' # false|strict|lax

View file

@ -1,3 +1,9 @@
# Be sure to restart your server when you modify this file. # Be sure to restart your server when you modify this file.
Rails.application.config.session_store :cookie_store, key: '_registry_session' secure_cookies = ENV['secure_session_cookies'] == 'true'
same_site_cookies = ENV['same_site_session_cookies'] != 'false' ? ENV['same_site_session_cookies'].to_sym : false
Rails.application.config.session_store :cookie_store,
key: '_registry_session',
secure: secure_cookies,
same_site: same_site_cookies