aboutsummaryrefslogtreecommitdiff
path: root/models
diff options
context:
space:
mode:
Diffstat (limited to 'models')
-rw-r--r--models/access.go6
-rw-r--r--models/repo.go2
2 files changed, 4 insertions, 4 deletions
diff --git a/models/access.go b/models/access.go
index 54816c7b..df3cd766 100644
--- a/models/access.go
+++ b/models/access.go
@@ -112,14 +112,12 @@ func (u *User) GetRepositoryAccesses() (map[*Repository]AccessMode, error) {
repo, err := GetRepositoryByID(access.RepoID)
if err != nil {
if errors.IsRepoNotExist(err) {
- log.Error(4, "GetRepositoryByID: %v", err)
+ log.Error(2, "GetRepositoryByID: %v", err)
continue
}
return nil, err
}
- if err = repo.GetOwner(); err != nil {
- return nil, err
- } else if repo.OwnerID == u.ID {
+ if repo.OwnerID == u.ID {
continue
}
repos[repo] = access.Mode
diff --git a/models/repo.go b/models/repo.go
index 5bdd565a..88932449 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -282,6 +282,8 @@ func (repo *Repository) HTMLURL() string {
return setting.AppURL + repo.FullName()
}
+// This method assumes following fields have been assigned with valid values:
+// Required - BaseRepo (if fork)
// Arguments that are allowed to be nil: permission
func (repo *Repository) APIFormat(permission *api.Permission) *api.Repository {
cloneLink := repo.CloneLink()