mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-24 14:25:02 +02:00
Merge branch 'dev' of github.com:gogits/gogs into access
Conflicts: gogs.go models/models.go models/user.go templates/.VERSION templates/org/home.tmpl
This commit is contained in:
commit
7ccab9cd09
65 files changed
+477
-462
No files matched your search
+1
-1
@@ -103,7 +103,7 @@ func CreateOrganization(org, owner *User) (*User, error) {
|
||||
return nil, ErrUserNameIllegal
|
||||
}
|
||||
|
||||
isExist, err := IsUserExist(org.Name)
|
||||
isExist, err := IsUserExist(0, org.Name)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
} else if isExist {
|
||||
|
||||
Reference in new issue
Block a user