pkg/setting: rename {AppUrl, AppSubUrl} -> {AppURL, AppSubURL}

22 files changed, 99 insertions, 99 deletions

diff --git a/routers/admin/admin.go b/routers/admin/admin.go
index c7aa7f02..69ca4877 100644
--- a/routers/admin/admin.go
+++ b/routers/admin/admin.go
@@ -165,7 +165,7 @@ func Dashboard(ctx *context.Context) {
 		} else {
 			ctx.Flash.Success(success)
 		}
-		ctx.Redirect(setting.AppSubUrl + "/admin")
+		ctx.Redirect(setting.AppSubURL + "/admin")
 		return
 	}
 
@@ -185,7 +185,7 @@ func SendTestMail(ctx *context.Context) {
 		ctx.Flash.Info(ctx.Tr("admin.config.test_mail_sent", email))
 	}
 
-	ctx.Redirect(setting.AppSubUrl + "/admin/config")
+	ctx.Redirect(setting.AppSubURL + "/admin/config")
 }
 
 func Config(ctx *context.Context) {
@@ -193,7 +193,7 @@ func Config(ctx *context.Context) {
 	ctx.Data["PageIsAdmin"] = true
 	ctx.Data["PageIsAdminConfig"] = true
 
-	ctx.Data["AppUrl"] = setting.AppUrl
+	ctx.Data["AppURL"] = setting.AppURL
 	ctx.Data["Domain"] = setting.Domain
 	ctx.Data["OfflineMode"] = setting.OfflineMode
 	ctx.Data["DisableRouterLog"] = setting.DisableRouterLog
diff --git a/routers/admin/auths.go b/routers/admin/auths.go
index 81a61957..532adb4f 100644
--- a/routers/admin/auths.go
+++ b/routers/admin/auths.go
@@ -163,7 +163,7 @@ func NewAuthSourcePost(ctx *context.Context, f form.Authentication) {
 	log.Trace("Authentication created by admin(%s): %s", ctx.User.Name, f.Name)
 
 	ctx.Flash.Success(ctx.Tr("admin.auths.new_success", f.Name))
-	ctx.Redirect(setting.AppSubUrl + "/admin/auths")
+	ctx.Redirect(setting.AppSubURL + "/admin/auths")
 }
 
 func EditAuthSource(ctx *context.Context) {
@@ -230,7 +230,7 @@ func EditAuthSourcePost(ctx *context.Context, f form.Authentication) {
 	log.Trace("Authentication changed by admin(%s): %d", ctx.User.Name, source.ID)
 
 	ctx.Flash.Success(ctx.Tr("admin.auths.update_success"))
-	ctx.Redirect(setting.AppSubUrl + "/admin/auths/" + com.ToStr(f.ID))
+	ctx.Redirect(setting.AppSubURL + "/admin/auths/" + com.ToStr(f.ID))
 }
 
 func DeleteAuthSource(ctx *context.Context) {
@@ -247,7 +247,7 @@ func DeleteAuthSource(ctx *context.Context) {
 			ctx.Flash.Error(fmt.Sprintf("DeleteSource: %v", err))
 		}
 		ctx.JSON(200, map[string]interface{}{
-			"redirect": setting.AppSubUrl + "/admin/auths/" + ctx.Params(":authid"),
+			"redirect": setting.AppSubURL + "/admin/auths/" + ctx.Params(":authid"),
 		})
 		return
 	}
@@ -255,6 +255,6 @@ func DeleteAuthSource(ctx *context.Context) {
 
 	ctx.Flash.Success(ctx.Tr("admin.auths.deletion_success"))
 	ctx.JSON(200, map[string]interface{}{
-		"redirect": setting.AppSubUrl + "/admin/auths",
+		"redirect": setting.AppSubURL + "/admin/auths",
 	})
 }
diff --git a/routers/admin/notice.go b/routers/admin/notice.go
index 4041a0fc..37f120bc 100644
--- a/routers/admin/notice.go
+++ b/routers/admin/notice.go
@@ -68,5 +68,5 @@ func EmptyNotices(ctx *context.Context) {
 
 	log.Trace("System notices deleted by admin (%s): [start: %d]", ctx.User.Name, 0)
 	ctx.Flash.Success(ctx.Tr("admin.notices.delete_success"))
-	ctx.Redirect(setting.AppSubUrl + "/admin/notices")
+	ctx.Redirect(setting.AppSubURL + "/admin/notices")
 }
diff --git a/routers/admin/repos.go b/routers/admin/repos.go
index 1cd0b749..b2691706 100644
--- a/routers/admin/repos.go
+++ b/routers/admin/repos.go
@@ -82,6 +82,6 @@ func DeleteRepo(ctx *context.Context) {
 
 	ctx.Flash.Success(ctx.Tr("repo.settings.deletion_success"))
 	ctx.JSON(200, map[string]interface{}{
-		"redirect": setting.AppSubUrl + "/admin/repos?page=" + ctx.Query("page"),
+		"redirect": setting.AppSubURL + "/admin/repos?page=" + ctx.Query("page"),
 	})
 }
diff --git a/routers/admin/users.go b/routers/admin/users.go
index 7bb9ec77..4b8949c1 100644
--- a/routers/admin/users.go
+++ b/routers/admin/users.go
@@ -120,7 +120,7 @@ func NewUserPost(ctx *context.Context, f form.AdminCrateUser) {
 	}
 
 	ctx.Flash.Success(ctx.Tr("admin.users.new_success", u.Name))
-	ctx.Redirect(setting.AppSubUrl + "/admin/users/" + com.ToStr(u.ID))
+	ctx.Redirect(setting.AppSubURL + "/admin/users/" + com.ToStr(u.ID))
 }
 
 func prepareUserInfo(ctx *context.Context) *models.User {
@@ -226,7 +226,7 @@ func EditUserPost(ctx *context.Context, f form.AdminEditUser) {
 	log.Trace("Account profile updated by admin (%s): %s", ctx.User.Name, u.Name)
 
 	ctx.Flash.Success(ctx.Tr("admin.users.update_profile_success"))
-	ctx.Redirect(setting.AppSubUrl + "/admin/users/" + ctx.Params(":userid"))
+	ctx.Redirect(setting.AppSubURL + "/admin/users/" + ctx.Params(":userid"))
 }
 
 func DeleteUser(ctx *context.Context) {
@@ -241,12 +241,12 @@ func DeleteUser(ctx *context.Context) {
 		case models.IsErrUserOwnRepos(err):
 			ctx.Flash.Error(ctx.Tr("admin.users.still_own_repo"))
 			ctx.JSON(200, map[string]interface{}{
-				"redirect": setting.AppSubUrl + "/admin/users/" + ctx.Params(":userid"),
+				"redirect": setting.AppSubURL + "/admin/users/" + ctx.Params(":userid"),
 			})
 		case models.IsErrUserHasOrgs(err):
 			ctx.Flash.Error(ctx.Tr("admin.users.still_has_org"))
 			ctx.JSON(200, map[string]interface{}{
-				"redirect": setting.AppSubUrl + "/admin/users/" + ctx.Params(":userid"),
+				"redirect": setting.AppSubURL + "/admin/users/" + ctx.Params(":userid"),
 			})
 		default:
 			ctx.Handle(500, "DeleteUser", err)
@@ -257,6 +257,6 @@ func DeleteUser(ctx *context.Context) {
 
 	ctx.Flash.Success(ctx.Tr("admin.users.deletion_success"))
 	ctx.JSON(200, map[string]interface{}{
-		"redirect": setting.AppSubUrl + "/admin/users",
+		"redirect": setting.AppSubURL + "/admin/users",
 	})
 }
diff --git a/routers/api/v1/repo/key.go b/routers/api/v1/repo/key.go
index df1a8bb8..4ac180f1 100644
--- a/routers/api/v1/repo/key.go
+++ b/routers/api/v1/repo/key.go
@@ -16,7 +16,7 @@ import (
 )
 
 func composeDeployKeysAPILink(repoPath string) string {
-	return setting.AppUrl + "api/v1/repos/" + repoPath + "/keys/"
+	return setting.AppURL + "api/v1/repos/" + repoPath + "/keys/"
 }
 
 // https://github.com/gogits/go-gogs-client/wiki/Repositories-Deploy-Keys#list-deploy-keys
diff --git a/routers/api/v1/user/key.go b/routers/api/v1/user/key.go
index 22df7548..b9ede63f 100644
--- a/routers/api/v1/user/key.go
+++ b/routers/api/v1/user/key.go
@@ -34,7 +34,7 @@ func GetUserByParams(ctx *context.APIContext) *models.User {
 }
 
 func composePublicKeysAPILink() string {
-	return setting.AppUrl + "api/v1/user/keys/"
+	return setting.AppURL + "api/v1/user/keys/"
 }
 
 func listPublicKeys(ctx *context.APIContext, uid int64) {
diff --git a/routers/dev/template.go b/routers/dev/template.go
index 89cdd10d..544b3f5d 100644
--- a/routers/dev/template.go
+++ b/routers/dev/template.go
@@ -14,7 +14,7 @@ func TemplatePreview(ctx *context.Context) {
 	ctx.Data["User"] = models.User{Name: "Unknown"}
 	ctx.Data["AppName"] = setting.AppName
 	ctx.Data["AppVer"] = setting.AppVer
-	ctx.Data["AppUrl"] = setting.AppUrl
+	ctx.Data["AppURL"] = setting.AppURL
 	ctx.Data["Code"] = "2014031910370000009fff6782aadb2162b4a997acb69d4400888e0b9274657374"
 	ctx.Data["ActiveCodeLives"] = setting.Service.ActiveCodeLives / 60
 	ctx.Data["ResetPwdCodeLives"] = setting.Service.ResetPwdCodeLives / 60
diff --git a/routers/home.go b/routers/home.go
index 66091579..eaf33815 100644
--- a/routers/home.go
+++ b/routers/home.go
@@ -34,7 +34,7 @@ func Home(ctx *context.Context) {
 	// Check auto-login.
 	uname := ctx.GetCookie(setting.CookieUserName)
 	if len(uname) != 0 {
-		ctx.Redirect(setting.AppSubUrl + "/user/login")
+		ctx.Redirect(setting.AppSubURL + "/user/login")
 		return
 	}
 
diff --git a/routers/install.go b/routers/install.go
index 2f94dc09..ccc87b3d 100644
--- a/routers/install.go
+++ b/routers/install.go
@@ -145,7 +145,7 @@ func Install(ctx *context.Context) {
 	f.SSHPort = setting.SSH.Port
 	f.UseBuiltinSSHServer = setting.SSH.StartBuiltinServer
 	f.HTTPPort = setting.HTTPPort
-	f.AppUrl = setting.AppUrl
+	f.AppUrl = setting.AppURL
 	f.LogRootPath = setting.LogRootPath
 
 	// E-mail service settings
diff --git a/routers/org/members.go b/routers/org/members.go
index 06d8fe6a..b63f2f47 100644
--- a/routers/org/members.go
+++ b/routers/org/members.go
@@ -87,7 +87,7 @@ func MembersAction(ctx *context.Context) {
 	if ctx.Params(":action") != "leave" {
 		ctx.Redirect(ctx.Org.OrgLink + "/members")
 	} else {
-		ctx.Redirect(setting.AppSubUrl + "/")
+		ctx.Redirect(setting.AppSubURL + "/")
 	}
 }
 
diff --git a/routers/org/org.go b/routers/org/org.go
index 42768dd5..8e666561 100644
--- a/routers/org/org.go
+++ b/routers/org/org.go
@@ -52,5 +52,5 @@ func CreatePost(ctx *context.Context, f form.CreateOrg) {
 	}
 	log.Trace("Organization created: %s", org.Name)
 
-	ctx.Redirect(setting.AppSubUrl + "/org/" + f.OrgName + "/dashboard")
+	ctx.Redirect(setting.AppSubURL + "/org/" + f.OrgName + "/dashboard")
 }
diff --git a/routers/org/setting.go b/routers/org/setting.go
index 2ce454fe..0d934892 100644
--- a/routers/org/setting.go
+++ b/routers/org/setting.go
@@ -63,7 +63,7 @@ func SettingsPost(ctx *context.Context, f form.UpdateOrgSetting) {
 			return
 		}
 		// reset ctx.org.OrgLink with new name
-		ctx.Org.OrgLink = setting.AppSubUrl + "/org/" + f.Name
+		ctx.Org.OrgLink = setting.AppSubURL + "/org/" + f.Name
 		log.Trace("Organization name changed: %s -> %s", org.Name, f.Name)
 	}
 	// In case it's just a case change.
@@ -130,7 +130,7 @@ func SettingsDelete(ctx *context.Context) {
 			}
 		} else {
 			log.Trace("Organization deleted: %s", org.Name)
-			ctx.Redirect(setting.AppSubUrl + "/")
+			ctx.Redirect(setting.AppSubURL + "/")
 		}
 		return
 	}
diff --git a/routers/repo/commit.go b/routers/repo/commit.go
index 9723b7f1..992b35f5 100644
--- a/routers/repo/commit.go
+++ b/routers/repo/commit.go
@@ -171,11 +171,11 @@ func Diff(ctx *context.Context) {
 	ctx.Data["Diff"] = diff
 	ctx.Data["Parents"] = parents
 	ctx.Data["DiffNotAvailable"] = diff.NumFiles() == 0
-	ctx.Data["SourcePath"] = setting.AppSubUrl + "/" + path.Join(userName, repoName, "src", commitID)
+	ctx.Data["SourcePath"] = setting.AppSubURL + "/" + path.Join(userName, repoName, "src", commitID)
 	if commit.ParentCount() > 0 {
-		ctx.Data["BeforeSourcePath"] = setting.AppSubUrl + "/" + path.Join(userName, repoName, "src", parents[0])
+		ctx.Data["BeforeSourcePath"] = setting.AppSubURL + "/" + path.Join(userName, repoName, "src", parents[0])
 	}
-	ctx.Data["RawPath"] = setting.AppSubUrl + "/" + path.Join(userName, repoName, "raw", commitID)
+	ctx.Data["RawPath"] = setting.AppSubURL + "/" + path.Join(userName, repoName, "raw", commitID)
 	ctx.HTML(200, DIFF)
 }
 
@@ -232,8 +232,8 @@ func CompareDiff(ctx *context.Context) {
 	ctx.Data["Commit"] = commit
 	ctx.Data["Diff"] = diff
 	ctx.Data["DiffNotAvailable"] = diff.NumFiles() == 0
-	ctx.Data["SourcePath"] = setting.AppSubUrl + "/" + path.Join(userName, repoName, "src", afterCommitID)
-	ctx.Data["BeforeSourcePath"] = setting.AppSubUrl + "/" + path.Join(userName, repoName, "src", beforeCommitID)
-	ctx.Data["RawPath"] = setting.AppSubUrl + "/" + path.Join(userName, repoName, "raw", afterCommitID)
+	ctx.Data["SourcePath"] = setting.AppSubURL + "/" + path.Join(userName, repoName, "src", afterCommitID)
+	ctx.Data["BeforeSourcePath"] = setting.AppSubURL + "/" + path.Join(userName, repoName, "src", beforeCommitID)
+	ctx.Data["RawPath"] = setting.AppSubURL + "/" + path.Join(userName, repoName, "raw", afterCommitID)
 	ctx.HTML(200, DIFF)
 }
diff --git a/routers/repo/editor.go b/routers/repo/editor.go
index a8ce490a..69c36b87 100644
--- a/routers/repo/editor.go
+++ b/routers/repo/editor.go
@@ -110,7 +110,7 @@ func editFile(ctx *context.Context, isNewFile bool) {
 	ctx.Data["MarkdownFileExts"] = strings.Join(setting.Markdown.FileExtensions, ",")
 	ctx.Data["LineWrapExtensions"] = strings.Join(setting.Repository.Editor.LineWrapExtensions, ",")
 	ctx.Data["PreviewableFileModes"] = strings.Join(setting.Repository.Editor.PreviewableFileModes, ",")
-	ctx.Data["EditorconfigURLPrefix"] = fmt.Sprintf("%s/api/v1/repos/%s/editorconfig/", setting.AppSubUrl, ctx.Repo.Repository.FullName())
+	ctx.Data["EditorconfigURLPrefix"] = fmt.Sprintf("%s/api/v1/repos/%s/editorconfig/", setting.AppSubURL, ctx.Repo.Repository.FullName())
 
 	ctx.HTML(200, EDIT_FILE)
 }
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index 875ff8fe..61401b43 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -116,8 +116,8 @@ func issues(ctx *context.Context, isPullList bool) {
 
 	// Must sign in to see issues about you.
 	if viewType != "all" && !ctx.IsSigned {
-		ctx.SetCookie("redirect_to", "/"+url.QueryEscape(setting.AppSubUrl+ctx.Req.RequestURI), 0, setting.AppSubUrl)
-		ctx.Redirect(setting.AppSubUrl + "/user/login")
+		ctx.SetCookie("redirect_to", "/"+url.QueryEscape(setting.AppSubURL+ctx.Req.RequestURI), 0, setting.AppSubURL)
+		ctx.Redirect(setting.AppSubURL + "/user/login")
 		return
 	}
 
@@ -653,7 +653,7 @@ func viewIssue(ctx *context.Context, isPullList bool) {
 	ctx.Data["NumParticipants"] = len(participants)
 	ctx.Data["Issue"] = issue
 	ctx.Data["IsIssueOwner"] = ctx.Repo.IsWriter() || (ctx.IsSigned && issue.IsPoster(ctx.User.ID))
-	ctx.Data["SignInLink"] = setting.AppSubUrl + "/user/login?redirect_to=" + ctx.Data["Link"].(string)
+	ctx.Data["SignInLink"] = setting.AppSubURL + "/user/login?redirect_to=" + ctx.Data["Link"].(string)
 	ctx.HTML(200, ISSUE_VIEW)
 }
 
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index 6ff313b7..b88500e8 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -371,9 +371,9 @@ func ViewPullFiles(ctx *context.Context) {
 		ctx.Data["Reponame"] = pull.HeadRepo.Name
 
 		headTarget := path.Join(pull.HeadUserName, pull.HeadRepo.Name)
-		ctx.Data["SourcePath"] = setting.AppSubUrl + "/" + path.Join(headTarget, "src", endCommitID)
-		ctx.Data["BeforeSourcePath"] = setting.AppSubUrl + "/" + path.Join(headTarget, "src", startCommitID)
-		ctx.Data["RawPath"] = setting.AppSubUrl + "/" + path.Join(headTarget, "raw", endCommitID)
+		ctx.Data["SourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", endCommitID)
+		ctx.Data["BeforeSourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", startCommitID)
+		ctx.Data["RawPath"] = setting.AppSubURL + "/" + path.Join(headTarget, "raw", endCommitID)
 	}
 
 	ctx.Data["RequireHighlightJS"] = true
@@ -573,9 +573,9 @@ func PrepareCompareDiff(
 	ctx.Data["IsImageFile"] = headCommit.IsImageFile
 
 	headTarget := path.Join(headUser.Name, repo.Name)
-	ctx.Data["SourcePath"] = setting.AppSubUrl + "/" + path.Join(headTarget, "src", headCommitID)
-	ctx.Data["BeforeSourcePath"] = setting.AppSubUrl + "/" + path.Join(headTarget, "src", prInfo.MergeBase)
-	ctx.Data["RawPath"] = setting.AppSubUrl + "/" + path.Join(headTarget, "raw", headCommitID)
+	ctx.Data["SourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", headCommitID)
+	ctx.Data["BeforeSourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", prInfo.MergeBase)
+	ctx.Data["RawPath"] = setting.AppSubURL + "/" + path.Join(headTarget, "raw", headCommitID)
 	return false
 }
 
diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index bdc471fe..3f99f53c 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -132,7 +132,7 @@ func CreatePost(ctx *context.Context, f form.CreateRepo) {
 	})
 	if err == nil {
 		log.Trace("Repository created [%d]: %s/%s", repo.ID, ctxUser.Name, repo.Name)
-		ctx.Redirect(setting.AppSubUrl + "/" + ctxUser.Name + "/" + repo.Name)
+		ctx.Redirect(setting.AppSubURL + "/" + ctxUser.Name + "/" + repo.Name)
 		return
 	}
 
@@ -204,7 +204,7 @@ func MigratePost(ctx *context.Context, f form.MigrateRepo) {
 	})
 	if err == nil {
 		log.Trace("Repository migrated [%d]: %s/%s", repo.ID, ctxUser.Name, f.RepoName)
-		ctx.Redirect(setting.AppSubUrl + "/" + ctxUser.Name + "/" + f.RepoName)
+		ctx.Redirect(setting.AppSubURL + "/" + ctxUser.Name + "/" + f.RepoName)
 		return
 	}
 
diff --git a/routers/repo/setting.go b/routers/repo/setting.go
index 6a049ead..f9dc4180 100644
--- a/routers/repo/setting.go
+++ b/routers/repo/setting.go
@@ -189,7 +189,7 @@ func SettingsPost(ctx *context.Context, f form.RepoSetting) {
 		}
 		log.Trace("Repository converted from mirror to regular: %s/%s", ctx.Repo.Owner.Name, repo.Name)
 		ctx.Flash.Success(ctx.Tr("repo.settings.convert_succeed"))
-		ctx.Redirect(setting.AppSubUrl + "/" + ctx.Repo.Owner.Name + "/" + repo.Name)
+		ctx.Redirect(setting.AppSubURL + "/" + ctx.Repo.Owner.Name + "/" + repo.Name)
 
 	case "transfer":
 		if !ctx.Repo.IsOwner() {
@@ -228,7 +228,7 @@ func SettingsPost(ctx *context.Context, f form.RepoSetting) {
 		}
 		log.Trace("Repository transfered: %s/%s -> %s", ctx.Repo.Owner.Name, repo.Name, newOwner)
 		ctx.Flash.Success(ctx.Tr("repo.settings.transfer_succeed"))
-		ctx.Redirect(setting.AppSubUrl + "/" + newOwner + "/" + repo.Name)
+		ctx.Redirect(setting.AppSubURL + "/" + newOwner + "/" + repo.Name)
 
 	case "delete":
 		if !ctx.Repo.IsOwner() {
@@ -307,7 +307,7 @@ func SettingsCollaboration(ctx *context.Context) {
 func SettingsCollaborationPost(ctx *context.Context) {
 	name := strings.ToLower(ctx.Query("collaborator"))
 	if len(name) == 0 || ctx.Repo.Owner.LowerName == name {
-		ctx.Redirect(setting.AppSubUrl + ctx.Req.URL.Path)
+		ctx.Redirect(setting.AppSubURL + ctx.Req.URL.Path)
 		return
 	}
 
@@ -315,7 +315,7 @@ func SettingsCollaborationPost(ctx *context.Context) {
 	if err != nil {
 		if errors.IsUserNotExist(err) {
 			ctx.Flash.Error(ctx.Tr("form.user_not_exist"))
-			ctx.Redirect(setting.AppSubUrl + ctx.Req.URL.Path)
+			ctx.Redirect(setting.AppSubURL + ctx.Req.URL.Path)
 		} else {
 			ctx.Handle(500, "GetUserByName", err)
 		}
@@ -325,7 +325,7 @@ func SettingsCollaborationPost(ctx *context.Context) {
 	// Organization is not allowed to be added as a collaborator
 	if u.IsOrganization() {
 		ctx.Flash.Error(ctx.Tr("repo.settings.org_not_allowed_to_be_collaborator"))
-		ctx.Redirect(setting.AppSubUrl + ctx.Req.URL.Path)
+		ctx.Redirect(setting.AppSubURL + ctx.Req.URL.Path)
 		return
 	}
 
@@ -339,7 +339,7 @@ func SettingsCollaborationPost(ctx *context.Context) {
 	}
 
 	ctx.Flash.Success(ctx.Tr("repo.settings.add_collaborator_success"))
-	ctx.Redirect(setting.AppSubUrl + ctx.Req.URL.Path)
+	ctx.Redirect(setting.AppSubURL + ctx.Req.URL.Path)
 }
 
 func ChangeCollaborationAccessMode(ctx *context.Context) {
diff --git a/routers/user/auth.go b/routers/user/auth.go
index 25c7988e..d54e674c 100644
--- a/routers/user/auth.go
+++ b/routers/user/auth.go
@@ -44,9 +44,9 @@ func AutoLogin(c *context.Context) (bool, error) {
 	defer func() {
 		if !isSucceed {
 			log.Trace("auto-login cookie cleared: %s", uname)
-			c.SetCookie(setting.CookieUserName, "", -1, setting.AppSubUrl)
-			c.SetCookie(setting.CookieRememberName, "", -1, setting.AppSubUrl)
-			c.SetCookie(setting.LoginStatusCookieName, "", -1, setting.AppSubUrl)
+			c.SetCookie(setting.CookieUserName, "", -1, setting.AppSubURL)
+			c.SetCookie(setting.CookieRememberName, "", -1, setting.AppSubURL)
+			c.SetCookie(setting.LoginStatusCookieName, "", -1, setting.AppSubURL)
 		}
 	}()
 
@@ -65,9 +65,9 @@ func AutoLogin(c *context.Context) (bool, error) {
 	isSucceed = true
 	c.Session.Set("uid", u.ID)
 	c.Session.Set("uname", u.Name)
-	c.SetCookie(setting.CSRFCookieName, "", -1, setting.AppSubUrl)
+	c.SetCookie(setting.CSRFCookieName, "", -1, setting.AppSubURL)
 	if setting.EnableLoginStatusCookie {
-		c.SetCookie(setting.LoginStatusCookieName, "true", 0, setting.AppSubUrl)
+		c.SetCookie(setting.LoginStatusCookieName, "true", 0, setting.AppSubURL)
 	}
 	return true, nil
 }
@@ -91,17 +91,17 @@ func Login(c *context.Context) {
 
 	redirectTo := c.Query("redirect_to")
 	if len(redirectTo) > 0 {
-		c.SetCookie("redirect_to", redirectTo, 0, setting.AppSubUrl)
+		c.SetCookie("redirect_to", redirectTo, 0, setting.AppSubURL)
 	} else {
 		redirectTo, _ = url.QueryUnescape(c.GetCookie("redirect_to"))
 	}
-	c.SetCookie("redirect_to", "", -1, setting.AppSubUrl)
+	c.SetCookie("redirect_to", "", -1, setting.AppSubURL)
 
 	if isSucceed {
 		if isValidRedirect(redirectTo) {
 			c.Redirect(redirectTo)
 		} else {
-			c.Redirect(setting.AppSubUrl + "/")
+			c.Redirect(setting.AppSubURL + "/")
 		}
 		return
 	}
@@ -112,8 +112,8 @@ func Login(c *context.Context) {
 func afterLogin(c *context.Context, u *models.User, remember bool) {
 	if remember {
 		days := 86400 * setting.LoginRememberDays
-		c.SetCookie(setting.CookieUserName, u.Name, days, setting.AppSubUrl, "", setting.CookieSecure, true)
-		c.SetSuperSecureCookie(u.Rands+u.Passwd, setting.CookieRememberName, u.Name, days, setting.AppSubUrl, "", setting.CookieSecure, true)
+		c.SetCookie(setting.CookieUserName, u.Name, days, setting.AppSubURL, "", setting.CookieSecure, true)
+		c.SetSuperSecureCookie(u.Rands+u.Passwd, setting.CookieRememberName, u.Name, days, setting.AppSubURL, "", setting.CookieSecure, true)
 	}
 
 	c.Session.Set("uid", u.ID)
@@ -122,19 +122,19 @@ func afterLogin(c *context.Context, u *models.User, remember bool) {
 	c.Session.Delete("twoFactorUserID")
 
 	// Clear whatever CSRF has right now, force to generate a new one
-	c.SetCookie(setting.CSRFCookieName, "", -1, setting.AppSubUrl)
+	c.SetCookie(setting.CSRFCookieName, "", -1, setting.AppSubURL)
 	if setting.EnableLoginStatusCookie {
-		c.SetCookie(setting.LoginStatusCookieName, "true", 0, setting.AppSubUrl)
+		c.SetCookie(setting.LoginStatusCookieName, "true", 0, setting.AppSubURL)
 	}
 
 	redirectTo, _ := url.QueryUnescape(c.GetCookie("redirect_to"))
-	c.SetCookie("redirect_to", "", -1, setting.AppSubUrl)
+	c.SetCookie("redirect_to", "", -1, setting.AppSubURL)
 	if isValidRedirect(redirectTo) {
 		c.Redirect(redirectTo)
 		return
 	}
 
-	c.Redirect(setting.AppSubUrl + "/")
+	c.Redirect(setting.AppSubURL + "/")
 }
 
 func LoginPost(c *context.Context, f form.SignIn) {
@@ -162,7 +162,7 @@ func LoginPost(c *context.Context, f form.SignIn) {
 
 	c.Session.Set("twoFactorRemember", f.Remember)
 	c.Session.Set("twoFactorUserID", u.ID)
-	c.Redirect(setting.AppSubUrl + "/user/login/two_factor")
+	c.Redirect(setting.AppSubURL + "/user/login/two_factor")
 }
 
 func LoginTwoFactor(c *context.Context) {
@@ -193,7 +193,7 @@ func LoginTwoFactorPost(c *context.Context) {
 		return
 	} else if !valid {
 		c.Flash.Error(c.Tr("settings.two_factor_invalid_passcode"))
-		c.Redirect(setting.AppSubUrl + "/user/login/two_factor")
+		c.Redirect(setting.AppSubURL + "/user/login/two_factor")
 		return
 	}
 
@@ -225,7 +225,7 @@ func LoginTwoFactorRecoveryCodePost(c *context.Context) {
 	if err := models.UseRecoveryCode(userID, c.Query("recovery_code")); err != nil {
 		if errors.IsTwoFactorRecoveryCodeNotFound(err) {
 			c.Flash.Error(c.Tr("auth.login_two_factor_invalid_recovery_code"))
-			c.Redirect(setting.AppSubUrl + "/user/login/two_factor_recovery_code")
+			c.Redirect(setting.AppSubURL + "/user/login/two_factor_recovery_code")
 		} else {
 			c.ServerError("UseRecoveryCode", err)
 		}
@@ -243,10 +243,10 @@ func LoginTwoFactorRecoveryCodePost(c *context.Context) {
 func SignOut(ctx *context.Context) {
 	ctx.Session.Delete("uid")
 	ctx.Session.Delete("uname")
-	ctx.SetCookie(setting.CookieUserName, "", -1, setting.AppSubUrl)
-	ctx.SetCookie(setting.CookieRememberName, "", -1, setting.AppSubUrl)
-	ctx.SetCookie(setting.CSRFCookieName, "", -1, setting.AppSubUrl)
-	ctx.Redirect(setting.AppSubUrl + "/")
+	ctx.SetCookie(setting.CookieUserName, "", -1, setting.AppSubURL)
+	ctx.SetCookie(setting.CookieRememberName, "", -1, setting.AppSubURL)
+	ctx.SetCookie(setting.CSRFCookieName, "", -1, setting.AppSubURL)
+	ctx.Redirect(setting.AppSubURL + "/")
 }
 
 func SignUp(ctx *context.Context) {
@@ -341,7 +341,7 @@ func SignUpPost(ctx *context.Context, cpt *captcha.Captcha, f form.Register) {
 		return
 	}
 
-	ctx.Redirect(setting.AppSubUrl + "/user/login")
+	ctx.Redirect(setting.AppSubURL + "/user/login")
 }
 
 func Activate(ctx *context.Context) {
@@ -389,7 +389,7 @@ func Activate(ctx *context.Context) {
 
 		ctx.Session.Set("uid", user.ID)
 		ctx.Session.Set("uname", user.Name)
-		ctx.Redirect(setting.AppSubUrl + "/")
+		ctx.Redirect(setting.AppSubURL + "/")
 		return
 	}
 
@@ -411,7 +411,7 @@ func ActivateEmail(ctx *context.Context) {
 		ctx.Flash.Success(ctx.Tr("settings.add_email_success"))
 	}
 
-	ctx.Redirect(setting.AppSubUrl + "/user/settings/email")
+	ctx.Redirect(setting.AppSubURL + "/user/settings/email")
 	return
 }
 
@@ -525,7 +525,7 @@ func ResetPasswdPost(ctx *context.Context) {
 		}
 
 		log.Trace("User password reset: %s", u.Name)
-		ctx.Redirect(setting.AppSubUrl + "/user/login")
+		ctx.Redirect(setting.AppSubURL + "/user/login")
 		return
 	}
 
diff --git a/routers/user/home.go b/routers/user/home.go
index b556a176..745c2afa 100644
--- a/routers/user/home.go
+++ b/routers/user/home.go
@@ -420,5 +420,5 @@ func Email2User(ctx *context.Context) {
 		ctx.NotFoundOrServerError("GetUserByEmail", errors.IsUserNotExist, err)
 		return
 	}
-	ctx.Redirect(setting.AppSubUrl + "/user/" + u.Name)
+	ctx.Redirect(setting.AppSubURL + "/user/" + u.Name)
 }
diff --git a/routers/user/setting.go b/routers/user/setting.go
index b9c70d64..84c69a62 100644
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -67,16 +67,16 @@ func handleUsernameChange(ctx *context.Context, newName string) {
 			switch {
 			case models.IsErrUserAlreadyExist(err):
 				ctx.Flash.Error(ctx.Tr("newName_been_taken"))
-				ctx.Redirect(setting.AppSubUrl + "/user/settings")
+				ctx.Redirect(setting.AppSubURL + "/user/settings")
 			case models.IsErrEmailAlreadyUsed(err):
 				ctx.Flash.Error(ctx.Tr("form.email_been_used"))
-				ctx.Redirect(setting.AppSubUrl + "/user/settings")
+				ctx.Redirect(setting.AppSubURL + "/user/settings")
 			case models.IsErrNameReserved(err):
 				ctx.Flash.Error(ctx.Tr("user.newName_reserved"))
-				ctx.Redirect(setting.AppSubUrl + "/user/settings")
+				ctx.Redirect(setting.AppSubURL + "/user/settings")
 			case models.IsErrNamePatternNotAllowed(err):
 				ctx.Flash.Error(ctx.Tr("user.newName_pattern_not_allowed"))
-				ctx.Redirect(setting.AppSubUrl + "/user/settings")
+				ctx.Redirect(setting.AppSubURL + "/user/settings")
 			default:
 				ctx.Handle(500, "ChangeUserName", err)
 			}
@@ -116,7 +116,7 @@ func SettingsPost(ctx *context.Context, f form.UpdateProfile) {
 
 	log.Trace("User settings updated: %s", ctx.User.Name)
 	ctx.Flash.Success(ctx.Tr("settings.update_profile_success"))
-	ctx.Redirect(setting.AppSubUrl + "/user/settings")
+	ctx.Redirect(setting.AppSubURL + "/user/settings")
 }
 
 // FIXME: limit size.
@@ -174,7 +174,7 @@ func SettingsAvatarPost(ctx *context.Context, f form.Avatar) {
 		ctx.Flash.Success(ctx.Tr("settings.update_avatar_success"))
 	}
 
-	ctx.Redirect(setting.AppSubUrl + "/user/settings/avatar")
+	ctx.Redirect(setting.AppSubURL + "/user/settings/avatar")
 }
 
 func SettingsDeleteAvatar(ctx *context.Context) {
@@ -182,7 +182,7 @@ func SettingsDeleteAvatar(ctx *context.Context) {
 		ctx.Flash.Error(err.Error())
 	}
 
-	ctx.Redirect(setting.AppSubUrl + "/user/settings/avatar")
+	ctx.Redirect(setting.AppSubURL + "/user/settings/avatar")
 }
 
 func SettingsPassword(ctx *context.Context) {
@@ -220,7 +220,7 @@ func SettingsPasswordPost(ctx *context.Context, f form.ChangePassword) {
 		ctx.Flash.Success(ctx.Tr("settings.change_password_success"))
 	}
 
-	ctx.Redirect(setting.AppSubUrl + "/user/settings/password")
+	ctx.Redirect(setting.AppSubURL + "/user/settings/password")
 }
 
 func SettingsEmails(ctx *context.Context) {
@@ -249,7 +249,7 @@ func SettingsEmailPost(ctx *context.Context, f form.AddEmail) {
 		}
 
 		log.Trace("Email made primary: %s", ctx.User.Name)
-		ctx.Redirect(setting.AppSubUrl + "/user/settings/email")
+		ctx.Redirect(setting.AppSubURL + "/user/settings/email")
 		return
 	}
 
@@ -293,7 +293,7 @@ func SettingsEmailPost(ctx *context.Context, f form.AddEmail) {
 	}
 
 	log.Trace("Email address added: %s", email.Email)
-	ctx.Redirect(setting.AppSubUrl + "/user/settings/email")
+	ctx.Redirect(setting.AppSubURL + "/user/settings/email")
 }
 
 func DeleteEmail(ctx *context.Context) {
@@ -308,7 +308,7 @@ func DeleteEmail(ctx *context.Context) {
 
 	ctx.Flash.Success(ctx.Tr("settings.email_deletion_success"))
 	ctx.JSON(200, map[string]interface{}{
-		"redirect": setting.AppSubUrl + "/user/settings/email",
+		"redirect": setting.AppSubURL + "/user/settings/email",
 	})
 }
 
@@ -348,7 +348,7 @@ func SettingsSSHKeysPost(ctx *context.Context, f form.AddSSHKey) {
 			ctx.Flash.Info(ctx.Tr("form.unable_verify_ssh_key"))
 		} else {
 			ctx.Flash.Error(ctx.Tr("form.invalid_ssh_key", err.Error()))
-			ctx.Redirect(setting.AppSubUrl + "/user/settings/ssh")
+			ctx.Redirect(setting.AppSubURL + "/user/settings/ssh")
 			return
 		}
 	}
@@ -369,7 +369,7 @@ func SettingsSSHKeysPost(ctx *context.Context, f form.AddSSHKey) {
 	}
 
 	ctx.Flash.Success(ctx.Tr("settings.add_key_success", f.Title))
-	ctx.Redirect(setting.AppSubUrl + "/user/settings/ssh")
+	ctx.Redirect(setting.AppSubURL + "/user/settings/ssh")
 }
 
 func DeleteSSHKey(ctx *context.Context) {
@@ -380,7 +380,7 @@ func DeleteSSHKey(ctx *context.Context) {
 	}
 
 	ctx.JSON(200, map[string]interface{}{
-		"redirect": setting.AppSubUrl + "/user/settings/ssh",
+		"redirect": setting.AppSubURL + "/user/settings/ssh",
 	})
 }
 
@@ -452,20 +452,20 @@ func SettingsTwoFactorEnablePost(c *context.Context) {
 
 	if !totp.Validate(c.Query("passcode"), secret) {
 		c.Flash.Error(c.Tr("settings.two_factor_invalid_passcode"))
-		c.Redirect(setting.AppSubUrl + "/user/settings/security/two_factor_enable")
+		c.Redirect(setting.AppSubURL + "/user/settings/security/two_factor_enable")
 		return
 	}
 
 	if err := models.NewTwoFactor(c.UserID(), secret); err != nil {
 		c.Flash.Error(c.Tr("settings.two_factor_enable_error", err))
-		c.Redirect(setting.AppSubUrl + "/user/settings/security/two_factor_enable")
+		c.Redirect(setting.AppSubURL + "/user/settings/security/two_factor_enable")
 		return
 	}
 
 	c.Session.Delete("twoFactorSecret")
 	c.Session.Delete("twoFactorURL")
 	c.Flash.Success(c.Tr("settings.two_factor_enable_success"))
-	c.Redirect(setting.AppSubUrl + "/user/settings/security/two_factor_recovery_codes")
+	c.Redirect(setting.AppSubURL + "/user/settings/security/two_factor_recovery_codes")
 }
 
 func SettingsTwoFactorRecoveryCodes(c *context.Context) {
@@ -499,7 +499,7 @@ func SettingsTwoFactorRecoveryCodesPost(c *context.Context) {
 		c.Flash.Success(c.Tr("settings.two_factor_regenerate_recovery_codes_success"))
 	}
 
-	c.Redirect(setting.AppSubUrl + "/user/settings/security/two_factor_recovery_codes")
+	c.Redirect(setting.AppSubURL + "/user/settings/security/two_factor_recovery_codes")
 }
 
 func SettingsTwoFactorDisable(c *context.Context) {
@@ -515,7 +515,7 @@ func SettingsTwoFactorDisable(c *context.Context) {
 
 	c.Flash.Success(c.Tr("settings.two_factor_disable_success"))
 	c.JSONSuccess(map[string]interface{}{
-		"redirect": setting.AppSubUrl + "/user/settings/security",
+		"redirect": setting.AppSubURL + "/user/settings/security",
 	})
 }
 
@@ -563,7 +563,7 @@ func SettingsLeaveOrganization(ctx *context.Context) {
 	}
 
 	ctx.JSON(200, map[string]interface{}{
-		"redirect": setting.AppSubUrl + "/user/settings/organizations",
+		"redirect": setting.AppSubURL + "/user/settings/organizations",
 	})
 }
 
@@ -581,7 +581,7 @@ func SettingsLeaveRepo(ctx *context.Context) {
 
 	ctx.Flash.Success(ctx.Tr("settings.repos.leave_success", repo.FullName()))
 	ctx.JSON(200, map[string]interface{}{
-		"redirect": setting.AppSubUrl + "/user/settings/repositories",
+		"redirect": setting.AppSubURL + "/user/settings/repositories",
 	})
 }
 
@@ -612,7 +612,7 @@ func SettingsApplicationsPost(ctx *context.Context, f form.NewAccessToken) {
 	ctx.Flash.Success(ctx.Tr("settings.generate_token_succees"))
 	ctx.Flash.Info(t.Sha1)
 
-	ctx.Redirect(setting.AppSubUrl + "/user/settings/applications")
+	ctx.Redirect(setting.AppSubURL + "/user/settings/applications")
 }
 
 func SettingsDeleteApplication(ctx *context.Context) {
@@ -623,7 +623,7 @@ func SettingsDeleteApplication(ctx *context.Context) {
 	}
 
 	ctx.JSON(200, map[string]interface{}{
-		"redirect": setting.AppSubUrl + "/user/settings/applications",
+		"redirect": setting.AppSubURL + "/user/settings/applications",
 	})
 }
 
@@ -659,16 +659,16 @@ func SettingsDelete(ctx *context.Context) {
 			switch {
 			case models.IsErrUserOwnRepos(err):
 				ctx.Flash.Error(ctx.Tr("form.still_own_repo"))
-				ctx.Redirect(setting.AppSubUrl + "/user/settings/delete")
+				ctx.Redirect(setting.AppSubURL + "/user/settings/delete")
 			case models.IsErrUserHasOrgs(err):
 				ctx.Flash.Error(ctx.Tr("form.still_has_org"))
-				ctx.Redirect(setting.AppSubUrl + "/user/settings/delete")
+				ctx.Redirect(setting.AppSubURL + "/user/settings/delete")
 			default:
 				ctx.Handle(500, "DeleteUser", err)
 			}
 		} else {
 			log.Trace("Account deleted: %s", ctx.User.Name)
-			ctx.Redirect(setting.AppSubUrl + "/")
+			ctx.Redirect(setting.AppSubURL + "/")
 		}
 		return
 	}