New UI merge in progress

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
 			}