diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/base/conf.go | 4 | ||||
| -rw-r--r-- | modules/middleware/repo.go | 6 |
2 files changed, 1 insertions, 9 deletions
diff --git a/modules/base/conf.go b/modules/base/conf.go index f905c381..b3a987e6 100644 --- a/modules/base/conf.go +++ b/modules/base/conf.go @@ -40,8 +40,6 @@ var ( InstallLock bool - EnableHttpsClone bool - LogInRememberDays int CookieUserName string CookieRememberName string @@ -286,8 +284,6 @@ func NewConfigContext() { InstallLock = Cfg.MustBool("security", "INSTALL_LOCK", false) - EnableHttpsClone = Cfg.MustBool("security", "ENABLE_HTTPS_CLONE", false) - LogInRememberDays = Cfg.MustInt("security", "LOGIN_REMEMBER_DAYS") CookieUserName = Cfg.MustValue("security", "COOKIE_USERNAME") CookieRememberName = Cfg.MustValue("security", "COOKIE_REMEMBER_NAME") diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go index cb4a8632..54b735af 100644 --- a/modules/middleware/repo.go +++ b/modules/middleware/repo.go @@ -71,12 +71,8 @@ func RepoAssignment(redirect bool) martini.Handler { ctx.Repo.IsWatching = models.IsWatching(ctx.User.Id, repo.Id) } ctx.Repo.Repository = repo - scheme := "http" - if base.EnableHttpsClone { - scheme = "https" - } ctx.Repo.CloneLink.SSH = fmt.Sprintf("%s@%s:%s/%s.git", base.RunUser, base.Domain, user.LowerName, repo.LowerName) - ctx.Repo.CloneLink.HTTPS = fmt.Sprintf("%s://%s/%s/%s.git", scheme, base.Domain, user.LowerName, repo.LowerName) + ctx.Repo.CloneLink.HTTPS = fmt.Sprintf("%s%s/%s.git", base.AppUrl, user.LowerName, repo.LowerName) if len(params["branchname"]) == 0 { params["branchname"] = "master" |