mirror of
https://github.com/go-gitea/gitea
synced 2025-12-07 13:28:25 +00:00
Merge branch 'master' into feat/approval
# Conflicts: # vendor/vendor.json
This commit is contained in:
@@ -119,6 +119,7 @@ func NewMacaron() *macaron.Macaron {
|
||||
Secret: setting.SecretKey,
|
||||
Cookie: setting.CSRFCookieName,
|
||||
SetCookie: true,
|
||||
Secure: setting.SessionConfig.Secure,
|
||||
Header: "X-Csrf-Token",
|
||||
CookiePath: setting.AppSubURL,
|
||||
}))
|
||||
|
||||
Reference in New Issue
Block a user