diff options
| author | Justin Nuß <nuss.justin@gmail.com> | 2014-07-26 11:23:58 +0200 |
|---|---|---|
| committer | Justin Nuß <nuss.justin@gmail.com> | 2014-07-26 11:23:58 +0200 |
| commit | 91480f3791f266369c343c539f8eeec245fa969a (patch) | |
| tree | a03ad6062fe4b546367cdb6f9921399458d97441 /modules/middleware/auth.go | |
| parent | 835e85b5ce9921ffd4d50b90b706e02685167331 (diff) | |
| parent | 35c75f06a0a4f321021984830d760e67ca0ef8e5 (diff) | |
| download | gitea-91480f3791f266369c343c539f8eeec245fa969a.tar.gz gitea-91480f3791f266369c343c539f8eeec245fa969a.zip | |
Merge branch 'dev' of https://github.com/gogits/Gogs into issue/281
Conflicts:
modules/base/tool.go
Diffstat (limited to 'modules/middleware/auth.go')
| -rw-r--r-- | modules/middleware/auth.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go index 214dda23b9..741337da0b 100644 --- a/modules/middleware/auth.go +++ b/modules/middleware/auth.go @@ -8,7 +8,7 @@ import ( "net/url" "strings" - "github.com/go-martini/martini" + "github.com/Unknwon/macaron" "github.com/gogits/gogs/modules/setting" ) @@ -20,7 +20,7 @@ type ToggleOptions struct { DisableCsrf bool } -func Toggle(options *ToggleOptions) martini.Handler { +func Toggle(options *ToggleOptions) macaron.Handler { return func(ctx *Context) { // Cannot view any page before installation. if !setting.InstallLock { @@ -49,7 +49,7 @@ func Toggle(options *ToggleOptions) martini.Handler { ctx.Redirect("/user/login") return } else if !ctx.User.IsActive && setting.Service.RegisterEmailConfirm { - ctx.Data["Title"] = "Activate Your Account" + // ctx.Data["Title"] = "Activate Your Account" ctx.HTML(200, "user/activate") return } |