diff options
| author | skyblue <ssx205@gmail.com> | 2014-03-23 22:40:35 +0800 |
|---|---|---|
| committer | skyblue <ssx205@gmail.com> | 2014-03-23 22:40:35 +0800 |
| commit | 4bac3616055110da6f060e98174bc2381ef91286 (patch) | |
| tree | 6fc09df1b6bef1a73fac40771702ae5f4f71f1d4 /modules/middleware/repo.go | |
| parent | b9302749ddc0e0a10911a83bf80e165b792c8c1e (diff) | |
| parent | f7f175a0793a53f3c50d20d89e324a610f94c442 (diff) | |
merge with branch master
Diffstat (limited to 'modules/middleware/repo.go')
| -rw-r--r-- | modules/middleware/repo.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go index a9a90e3f..eea2570c 100644 --- a/modules/middleware/repo.go +++ b/modules/middleware/repo.go @@ -54,7 +54,7 @@ func RepoAssignment(redirect bool) martini.Handler { ctx.Repo.Owner = user // get repository - repo, err := models.GetRepositoryByName(user, params["reponame"]) + repo, err := models.GetRepositoryByName(user.Id, params["reponame"]) if err != nil { if redirect { ctx.Redirect("/") @@ -69,8 +69,12 @@ 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("git@%s:%s/%s.git", base.Domain, user.LowerName, repo.LowerName) - ctx.Repo.CloneLink.HTTPS = fmt.Sprintf("https://%s/%s/%s.git", 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.Data["IsRepositoryValid"] = true ctx.Data["Repository"] = repo |