Revert "fork render"

This reverts commit 56af7e99a8.

routers/user/user.go

@@ -9,6 +9,8 @@ import (
 	"strings"
 
 	"github.com/codegangsta/martini"
+	"github.com/martini-contrib/render"
+	"github.com/martini-contrib/sessions"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/auth"
@@ -33,7 +35,7 @@ func Dashboard(ctx *middleware.Context) {
 		return
 	}
 	ctx.Data["Feeds"] = feeds
-	ctx.HTML(200, "user/dashboard", ctx.Data)
+	ctx.Render.HTML(200, "user/dashboard", ctx.Data)
 }
 
 func Profile(ctx *middleware.Context, params martini.Params) {
@@ -68,19 +70,19 @@ func Profile(ctx *middleware.Context, params martini.Params) {
 		ctx.Data["Repos"] = repos
 	}
 
-	ctx.HTML(200, "user/profile", ctx.Data)
+	ctx.Render.HTML(200, "user/profile", ctx.Data)
 }
 
 func SignIn(ctx *middleware.Context, form auth.LogInForm) {
 	ctx.Data["Title"] = "Log In"
 
 	if ctx.Req.Method == "GET" {
-		ctx.HTML(200, "user/signin", ctx.Data)
+		ctx.Render.HTML(200, "user/signin", ctx.Data)
 		return
 	}
 
 	if hasErr, ok := ctx.Data["HasError"]; ok && hasErr.(bool) {
-		ctx.HTML(200, "user/signin", ctx.Data)
+		ctx.Render.HTML(200, "user/signin", ctx.Data)
 		return
 	}
 
@@ -97,13 +99,14 @@ func SignIn(ctx *middleware.Context, form auth.LogInForm) {
 
 	ctx.Session.Set("userId", user.Id)
 	ctx.Session.Set("userName", user.Name)
-	ctx.Redirect("/")
+
+	ctx.Render.Redirect("/")
 }
 
-func SignOut(ctx *middleware.Context) {
-	ctx.Session.Delete("userId")
-	ctx.Session.Delete("userName")
-	ctx.Redirect("/")
+func SignOut(r render.Render, session sessions.Session) {
+	session.Delete("userId")
+	session.Delete("userName")
+	r.Redirect("/")
 }
 
 func SignUp(ctx *middleware.Context, form auth.RegisterForm) {
@@ -111,7 +114,7 @@ func SignUp(ctx *middleware.Context, form auth.RegisterForm) {
 	ctx.Data["PageIsSignUp"] = true
 
 	if ctx.Req.Method == "GET" {
-		ctx.HTML(200, "user/signup", ctx.Data)
+		ctx.Render.HTML(200, "user/signup", ctx.Data)
 		return
 	}
 
@@ -124,7 +127,7 @@ func SignUp(ctx *middleware.Context, form auth.RegisterForm) {
 	}
 
 	if ctx.HasError() {
-		ctx.HTML(200, "user/signup", ctx.Data)
+		ctx.Render.HTML(200, "user/signup", ctx.Data)
 		return
 	}
 
@@ -154,7 +157,7 @@ func SignUp(ctx *middleware.Context, form auth.RegisterForm) {
 	if base.Service.RegisterEmailConfirm {
 		auth.SendRegisterMail(u)
 	}
-	ctx.Redirect("/user/login")
+	ctx.Render.Redirect("/user/login")
 }
 
 func Delete(ctx *middleware.Context) {
@@ -163,7 +166,7 @@ func Delete(ctx *middleware.Context) {
 	ctx.Data["IsUserPageSettingDelete"] = true
 
 	if ctx.Req.Method == "GET" {
-		ctx.HTML(200, "user/delete", ctx.Data)
+		ctx.Render.HTML(200, "user/delete", ctx.Data)
 		return
 	}
 
@@ -183,12 +186,12 @@ func Delete(ctx *middleware.Context) {
 				return
 			}
 		} else {
-			ctx.Redirect("/")
+			ctx.Render.Redirect("/")
 			return
 		}
 	}
 
-	ctx.HTML(200, "user/delete", ctx.Data)
+	ctx.Render.HTML(200, "user/delete", ctx.Data)
 }
 
 const (
@@ -199,7 +202,7 @@ const (
 func Feeds(ctx *middleware.Context, form auth.FeedsForm) {
 	actions, err := models.GetFeeds(form.UserId, form.Page*20, false)
 	if err != nil {
-		ctx.JSON(500, err)
+		ctx.Render.JSON(500, err)
 	}
 
 	feeds := make([]string, len(actions))
@@ -207,19 +210,19 @@ func Feeds(ctx *middleware.Context, form auth.FeedsForm) {
 		feeds[i] = fmt.Sprintf(TPL_FEED, base.ActionIcon(actions[i].OpType),
 			base.TimeSince(actions[i].Created), base.ActionDesc(actions[i], ctx.User.AvatarLink()))
 	}
-	ctx.JSON(200, &feeds)
+	ctx.Render.JSON(200, &feeds)
 }
 
 func Issues(ctx *middleware.Context) {
-	ctx.HTML(200, "user/issues", ctx.Data)
+	ctx.Render.HTML(200, "user/issues", ctx.Data)
 }
 
 func Pulls(ctx *middleware.Context) {
-	ctx.HTML(200, "user/pulls", ctx.Data)
+	ctx.Render.HTML(200, "user/pulls", ctx.Data)
 }
 
 func Stars(ctx *middleware.Context) {
-	ctx.HTML(200, "user/stars", ctx.Data)
+	ctx.Render.HTML(200, "user/stars", ctx.Data)
 }
 
 func Activate(ctx *middleware.Context) {