merge upstream, resolve migration conflicts

This commit is contained in:
Manush Dodunekov
2020-01-09 07:51:45 +01:00
38 changed files with 626 additions and 141 deletions
+1 -1
View File
@@ -196,7 +196,7 @@ func (repo *Repository) refreshAccesses(e Engine, accessMap map[int64]*userAcces
if ua.Mode < minMode && !ua.User.IsRestricted {
continue
}
newAccesses = append(newAccesses, Access{
UserID: userID,
RepoID: repo.ID,