From: evolvedlight <steve@evolvedlight.co.uk>
Date: Mon, 13 Oct 2014 19:30:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/dev'
X-Git-Tag: v0.9.99~1692^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8d2a6fc484b540819e211d52b8d54e97269f0918;p=gitea.git

Merge remote-tracking branch 'upstream/dev'

Conflicts:
	models/repo.go
---

8d2a6fc484b540819e211d52b8d54e97269f0918
diff --cc models/repo.go
index 0ca8b305ea,419d034c66..d156621c83
--- a/models/repo.go
+++ b/models/repo.go
@@@ -174,14 -177,14 +177,22 @@@ func (repo *Repository) GetMirror() (er
  	return err
  }
  
 +func (repo *Repository) GetPath() string {
 +        return RepoPath(repo.Owner.Name, repo.Name)
 +}
 +
 +func (repo *Repository) IsOwnedBy(u *User) bool {
 +        return repo.OwnerId == u.Id
 +}
 +
+ func (repo *Repository) HasAccess(uname string) bool {
+ 	if err := repo.GetOwner(); err != nil {
+ 		return false
+ 	}
+ 	has, _ := HasAccess(uname, path.Join(repo.Owner.Name, repo.Name), READABLE)
+ 	return has
+ }
+ 
  // DescriptionHtml does special handles to description and return HTML string.
  func (repo *Repository) DescriptionHtml() template.HTML {
  	sanitize := func(s string) string {