diff --git a/gogs.go b/gogs.go index 8059086bf..e54eba828 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.7.19.1120 Beta" +const APP_VER = "0.7.19.1121 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/models/login.go b/models/login.go index 79a262c57..011d946a4 100644 --- a/models/login.go +++ b/models/login.go @@ -225,10 +225,9 @@ func DeleteSource(source *LoginSource) error { // |_______ \/_______ /\____|__ /____| // \/ \/ \/ -// Query if name/passwd can login against the LDAP directory pool -// Create a local user if success -// Return the same LoginUserPlain semantic -// FIXME: https://github.com/gogits/gogs/issues/672 +// LoginUserLDAPSource queries if name/passwd can login against the LDAP directory pool, +// and create a local user if success when enabled. +// It returns the same LoginUserPlain semantic. func LoginUserLDAPSource(u *User, name, passwd string, source *LoginSource, autoRegister bool) (*User, error) { cfg := source.Cfg.(*LDAPConfig) directBind := (source.Type == DLDAP) diff --git a/templates/.VERSION b/templates/.VERSION index 8c46b68d5..d5e407396 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.7.19.1120 Beta \ No newline at end of file +0.7.19.1121 Beta \ No newline at end of file diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index 571ea1a99..1a4efa8f1 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -9,7 +9,7 @@ {{.i18n.Tr "admin.config.server_config"}}
{{.CacheConn}}
{{.Config}}