mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 00:20:25 +08:00 
			
		
		
		
	Merge branch 'master' of github.com:gogits/gogs
Conflicts: templates/user/signup.tmpl
This commit is contained in:
		@@ -16,5 +16,6 @@ func Home(r render.Render, data base.TmplData, session sessions.Session) {
 | 
			
		||||
		user.Dashboard(r, data, session)
 | 
			
		||||
		return
 | 
			
		||||
	}
 | 
			
		||||
	r.HTML(200, "home", nil)
 | 
			
		||||
	data["PageIsHome"] = true
 | 
			
		||||
	r.HTML(200, "home", data)
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -27,6 +27,7 @@ func Dashboard(r render.Render, data base.TmplData, session sessions.Session) {
 | 
			
		||||
	data["IsSigned"] = true
 | 
			
		||||
	data["SignedUserId"] = SignedInId(session)
 | 
			
		||||
	data["SignedUserName"] = SignedInName(session)
 | 
			
		||||
	data["PageIsUserDashboard"] = true
 | 
			
		||||
 | 
			
		||||
	data["Title"] = "Dashboard"
 | 
			
		||||
	r.HTML(200, "user/dashboard", data)
 | 
			
		||||
@@ -112,6 +113,7 @@ func SignIn(req *http.Request, r render.Render, session sessions.Session) {
 | 
			
		||||
 | 
			
		||||
func SignUp(form auth.RegisterForm, data base.TmplData, req *http.Request, r render.Render) {
 | 
			
		||||
	data["Title"] = "Sign Up"
 | 
			
		||||
	data["PageIsSignUp"] = true
 | 
			
		||||
 | 
			
		||||
	if req.Method == "GET" {
 | 
			
		||||
		r.HTML(200, "user/signup", data)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user