mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-26 12:27:06 +00:00 
			
		
		
		
	Allow Gogs to run from a suburl behind a reverse proxy. e.g. http://mydomain.com/gogs/
Conflicts: modules/setting/setting.go Conflicts: templates/repo/release/list.tmpl templates/user/dashboard/dashboard.tmpl Conflicts: routers/repo/setting.go
This commit is contained in:
		| @@ -25,13 +25,13 @@ func Toggle(options *ToggleOptions) macaron.Handler { | ||||
| 	return func(ctx *Context) { | ||||
| 		// Cannot view any page before installation. | ||||
| 		if !setting.InstallLock { | ||||
| 			ctx.Redirect("/install") | ||||
| 			ctx.Redirect(setting.AppRootSubUrl + "/install") | ||||
| 			return | ||||
| 		} | ||||
|  | ||||
| 		// Redirect to dashboard if user tries to visit any non-login page. | ||||
| 		if options.SignOutRequire && ctx.IsSigned && ctx.Req.RequestURI != "/" { | ||||
| 			ctx.Redirect("/") | ||||
| 			ctx.Redirect(setting.AppRootSubUrl + "/") | ||||
| 			return | ||||
| 		} | ||||
|  | ||||
| @@ -48,8 +48,8 @@ func Toggle(options *ToggleOptions) macaron.Handler { | ||||
| 				if strings.HasSuffix(ctx.Req.RequestURI, "watch") { | ||||
| 					return | ||||
| 				} | ||||
| 				ctx.SetCookie("redirect_to", "/"+url.QueryEscape(ctx.Req.RequestURI)) | ||||
| 				ctx.Redirect("/user/login") | ||||
| 				ctx.SetCookie("redirect_to", "/"+url.QueryEscape(setting.AppRootSubUrl + ctx.Req.RequestURI)) | ||||
| 				ctx.Redirect(setting.AppRootSubUrl + "/user/login") | ||||
| 				return | ||||
| 			} else if !ctx.User.IsActive && setting.Service.RegisterEmailConfirm { | ||||
| 				ctx.Data["Title"] = ctx.Tr("auth.active_your_account") | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Martin van Beurden
					Martin van Beurden