diff options
| author | Unknwon <joe2010xtmf@163.com> | 2014-09-21 12:19:50 -0400 |
|---|---|---|
| committer | Unknwon <joe2010xtmf@163.com> | 2014-09-21 12:19:50 -0400 |
| commit | 4a01bb8fa40e770433b6858a97e336393cb8e9b2 (patch) | |
| tree | e42daade1c3cab7ba4d2e769b861416a924ebafe | |
| parent | d325b23dbb44fe3b1e542ee330185610e861279e (diff) | |
| download | gitea-4a01bb8fa40e770433b6858a97e336393cb8e9b2.tar.gz gitea-4a01bb8fa40e770433b6858a97e336393cb8e9b2.zip | |
Mirror bug fix
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | README_ZH.md | 2 | ||||
| -rw-r--r-- | cmd/web.go | 7 | ||||
| -rw-r--r-- | gogs.go | 2 | ||||
| -rw-r--r-- | modules/setting/setting.go | 1 | ||||
| -rw-r--r-- | templates/.VERSION | 2 |
7 files changed, 8 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 2600693b63..eb5732ff60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,5 +2,4 @@ language: go go: - 1.2 - - 1.3 - - tip
\ No newline at end of file + - 1.3
\ No newline at end of file @@ -5,7 +5,7 @@ Gogs(Go Git Service) is a painless self-hosted Git Service written in Go.  -##### Current version: 0.5.2 Beta +##### Current version: 0.5.3 Beta ### NOTICES diff --git a/README_ZH.md b/README_ZH.md index 4f59e00187..fcc8b49694 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -5,7 +5,7 @@ Gogs(Go Git Service) 是一个基于 Go 语言的自助 Git 服务。  -##### 当前版本：0.5.2 Beta +##### 当前版本：0.5.3 Beta ## 开发目的 diff --git a/cmd/web.go b/cmd/web.go index 83dfca4e67..45f35a35af 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -97,10 +97,9 @@ func newMacaron() *macaron.Macaron { Config: *setting.SessionConfig, })) m.Use(csrf.Generate(csrf.Options{ - Secret: setting.SecretKey, - SetCookie: true, - Header: "X-Csrf-Token", - CookiePath: setting.AppSubUrl, + Secret: setting.SecretKey, + SetCookie: true, + Header: "X-Csrf-Token", })) m.Use(toolbox.Toolboxer(m, toolbox.Options{ HealthCheckFuncs: []*toolbox.HealthCheckFuncDesc{ @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.5.3.0919 Beta" +const APP_VER = "0.5.3.0921 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/modules/setting/setting.go b/modules/setting/setting.go index a1ab43d022..321282df25 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -380,7 +380,6 @@ func newSessionService() { SessionConfig = new(session.Config) SessionConfig.ProviderConfig = strings.Trim(Cfg.MustValue("session", "PROVIDER_CONFIG"), "\" ") SessionConfig.CookieName = Cfg.MustValue("session", "COOKIE_NAME", "i_like_gogits") - SessionConfig.CookiePath = AppSubUrl SessionConfig.Secure = Cfg.MustBool("session", "COOKIE_SECURE") SessionConfig.EnableSetCookie = Cfg.MustBool("session", "ENABLE_SET_COOKIE", true) SessionConfig.Gclifetime = Cfg.MustInt64("session", "GC_INTERVAL_TIME", 86400) diff --git a/templates/.VERSION b/templates/.VERSION index 9df945b783..4e0c5d6102 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.5.3.0919 Beta
\ No newline at end of file +0.5.3.0921 Beta
\ No newline at end of file |