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

2014-09-02 13:01:09 -04:00 · 2014-09-02 13:01:09 -04:00 · 05a33107c9
parent 8b0e815d98 f19fc230d4
commit 05a33107c9
2 changed files with 2 additions and 1 deletions
--- a/cmd/web.go
+++ b/cmd/web.go
@ -95,6 +95,7 @@ func newMacaron() *macaron.Macaron {
 	m.Use(csrf.Generate(csrf.Options{
 		Secret:    setting.SecretKey,
 		SetCookie: true,
+		Header:    "X-Csrf-Token",
 	}))
 	m.Use(toolbox.Toolboxer(m, toolbox.Options{
 		HealthCheckFuncs: []*toolbox.HealthCheckFuncDesc{
--- a/conf/locale/locale_de-DE.ini
+++ b/conf/locale/locale_de-DE.ini
@ -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
 dashboard = Dashboard