summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2021-06-16 14:15:52 +0000
committerGo MAEDA <maeda@farend.jp>2021-06-16 14:15:52 +0000
commitfca6787a2dedfc78219d3c660c9561d2c4a40d3b (patch)
tree4b95048333523adab8031603844660629ed24568 /app
parent95cd9e3440d22173ceee4aca2c5af8435f43fd2b (diff)
downloadredmine-fca6787a2dedfc78219d3c660c9561d2c4a40d3b.tar.gz
redmine-fca6787a2dedfc78219d3c660c9561d2c4a40d3b.zip
Merged r21009 from trunk to 4.2-stable (#35226).
git-svn-id: http://svn.redmine.org/redmine/branches/4.2-stable@21037 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/controllers/account_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index c6d13d417..e1b3d4f2b 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -404,6 +404,7 @@ class AccountController < ApplicationController
:value => token,
:expires => 1.year.from_now,
:path => (Redmine::Configuration['autologin_cookie_path'] || RedmineApp::Application.config.relative_url_root || '/'),
+ :same_site => :lax,
:secure => secure,
:httponly => true
}