diff options
| author | slene <vslene@gmail.com> | 2014-03-20 21:02:52 +0800 |
|---|---|---|
| committer | slene <vslene@gmail.com> | 2014-03-20 21:02:52 +0800 |
| commit | c6bd723ce17ae3c0495f84e46a9296b30db5aee1 (patch) | |
| tree | a2153db027aa03db50f2e7f841bd2545fa65a2bd /modules/middleware/repo.go | |
| parent | 21379e30a18fed473ae2bbeb41332919ff80497d (diff) | |
| parent | c7b6fbfd46fe465b5103ecc0b743ea009eb1e586 (diff) | |
Merge branch 'master' of github.com:gogits/gogs
Conflicts:
public/js/app.js
Diffstat (limited to 'modules/middleware/repo.go')
| -rw-r--r-- | modules/middleware/repo.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go index f0cab8e8..62c67bce 100644 --- a/modules/middleware/repo.go +++ b/modules/middleware/repo.go @@ -65,9 +65,12 @@ func RepoAssignment(redirect bool) martini.Handler { } ctx.Repo.IsValid = true - ctx.Repo.IsWatching = models.IsWatching(ctx.User.Id, repo.Id) + if ctx.User != nil { + ctx.Repo.IsWatching = models.IsWatching(ctx.User.Id, repo.Id) + } ctx.Repo.Repository = repo - ctx.Repo.CloneLink.SSH = fmt.Sprintf("git@%s:%s/%s.git", base.Domain, ctx.User.LowerName, repo.LowerName) + 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.Data["IsRepositoryValid"] = true ctx.Data["Repository"] = repo |