From 0730ec408787f27c02d7f71d8e0cb713c0a95b57 Mon Sep 17 00:00:00 2001
From: Arpemedia <arens@arpemedia.com>
Date: Tue, 2 Sep 2014 13:46:18 +0200
Subject: [PATCH 1/2] Fix grammar error in German translation

---
 conf/locale/locale_de-DE.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/locale/locale_de-DE.ini b/conf/locale/locale_de-DE.ini
index 3e9936d6e4..19b2b5d11f 100644
--- 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

From 9476e58de941624912a3ceb89d52d36e79c03358 Mon Sep 17 00:00:00 2001
From: Vyacheslav Bakhmutov <m0sth8@yandex-team.ru>
Date: Tue, 2 Sep 2014 22:48:40 +0700
Subject: [PATCH 2/2] Set headers in js and go files to X-Csrf-Token

---
 cmd/web.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmd/web.go b/cmd/web.go
index 2199d4ca1e..57164683ac 100644
--- 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{