test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'dev' of github.com:gogits/gogs into dev

This commit is contained in:
Unknwon 2014-09-02 13:01:09 -04:00
parent 8b0e815d98 f19fc230d4
commit 05a33107c9
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/web.go
View File

@ -95,6 +95,7 @@ func newMacaron() *macaron.Macaron {
m.Use(csrf.Generate(csrf.Options{ m.Use(csrf.Generate(csrf.Options{
Secret: setting.SecretKey, Secret: setting.SecretKey,
SetCookie: true, SetCookie: true,
Header: "X-Csrf-Token",
})) }))
m.Use(toolbox.Toolboxer(m, toolbox.Options{ m.Use(toolbox.Toolboxer(m, toolbox.Options{
HealthCheckFuncs: []*toolbox.HealthCheckFuncDesc{ HealthCheckFuncs: []*toolbox.HealthCheckFuncDesc{

2
conf/locale/locale_de-DE.ini
View File

@ -1,4 +1,4 @@
app_desc = Ein einfacher, selbst gehostetes Git-Service, geschrieben in Go. app_desc = Ein einfacher, selbst gehosteter Git-Service, geschrieben in Go.
home = Home home = Home
dashboard = Dashboard dashboard = Dashboard