Merge remote-tracking branch 'upstream/dev'

Conflicts:
	models/repo.go

diff --cc models/models.go
Simple merge

diff --cc models/repo.go
index 0ca8b305eab53aa1d4ccf8d0e331b8e73ba80a92,419d034c66d0776b64a3732bf0b85bac1669067b..d156621c8356c23cc09b0797bffcd7a3cd88db64
--- 1/models/repo.go
--- 2/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 {

diff --cc templates/repo/diff.tmpl
Simple merge