diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2014-03-26 14:38:14 +0800 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2014-03-26 14:38:14 +0800 |
| commit | 9dbc808c7b71fc97015346704bb3d3db4918aba0 (patch) | |
| tree | f0d76b189a0137bcb455e548e52805787d680fa7 /modules/middleware | |
| parent | f9024b3f43c700ae997c284458fcc1d0dfc2e9a7 (diff) | |
| parent | 06cf878471af02376dfcd02b9781982a89c27a2a (diff) | |
Merge branch 'master' of github.com:gogits/gogs
Conflicts:
models/repo.go
modules/base/tool.go
serve.go
Diffstat (limited to 'modules/middleware')
| -rw-r--r-- | modules/middleware/repo.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go index eea2570c..bc90c05c 100644 --- a/modules/middleware/repo.go +++ b/modules/middleware/repo.go @@ -73,9 +73,14 @@ func RepoAssignment(redirect bool) martini.Handler { 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.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) + if len(params["branchname"]) == 0 { + params["branchname"] = "master" + } + ctx.Data["Branchname"] = params["branchname"] + ctx.Data["IsRepositoryValid"] = true ctx.Data["Repository"] = repo ctx.Data["Owner"] = user |