sim1222-mirror/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-08-09 18:23:57 +09:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into feature/rewrite-xorm-queries

Browse Source 
# Conflicts:
#	models/git_diff.go
#	models/issue.go
#	models/org.go
#	models/pull.go
#	models/repo.go
This commit is contained in:
Thibault Meyer
2016-11-10 21:05:52 +01:00
parent a4454f5d0f 4247304f5a
commit b0ddced2b5
168 changed files with 478 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
models/login_source.go
View File

@ -19,9 +19,9 @@ import (
"github.com/go-xorm/core"
"github.com/go-xorm/xorm"
"github.com/go-gitea/gitea/modules/auth/ldap"
"github.com/go-gitea/gitea/modules/auth/pam"
"github.com/go-gitea/gitea/modules/log"
"code.gitea.io/gitea/modules/auth/ldap"
"code.gitea.io/gitea/modules/auth/pam"
"code.gitea.io/gitea/modules/log"
)
type LoginType int