diff --git a/gogs.go b/gogs.go index 8059086bfa..e54eba8289 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 79a262c575..011d946a47 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 8c46b68d5f..d5e407396f 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 571ea1a99e..1a4efa8f1c 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -9,7 +9,7 @@ {{.i18n.Tr "admin.config.server_config"}}
-
+
{{.i18n.Tr "admin.config.app_name"}}
{{AppName}}
{{.i18n.Tr "admin.config.app_ver"}}
@@ -22,12 +22,12 @@
{{.i18n.Tr "admin.config.disable_router_log"}}
-
+
{{.i18n.Tr "admin.config.run_user"}}
{{.RunUser}}
{{.i18n.Tr "admin.config.run_mode"}}
{{.RunMode}}
-
+
{{.i18n.Tr "admin.config.repo_root_path"}}
{{.RepoRootPath}}
{{.i18n.Tr "admin.config.static_file_root_path"}}
@@ -39,7 +39,7 @@
{{.i18n.Tr "admin.config.reverse_auth_user"}}
{{.ReverseProxyAuthUser}}
-
+

{{.i18n.Tr "admin.config.db_config"}} @@ -59,13 +59,13 @@
{{.i18n.Tr "admin.config.db_path"}}
{{.DbCfg.Path}} {{.i18n.Tr "admin.config.db_path_helper"}}
- +

{{.i18n.Tr "admin.config.service_config"}}

-
+
{{.i18n.Tr "admin.config.register_email_confirm"}}
{{.i18n.Tr "admin.config.disable_register"}}
@@ -82,19 +82,19 @@
{{.i18n.Tr "admin.config.enable_captcha"}}
-
+
{{.i18n.Tr "admin.config.active_code_lives"}}
{{.Service.ActiveCodeLives}} {{.i18n.Tr "tool.raw_minutes"}}
{{.i18n.Tr "admin.config.reset_password_code_lives"}}
{{.Service.ResetPwdCodeLives}} {{.i18n.Tr "tool.raw_minutes"}}
-
+

{{.i18n.Tr "admin.config.webhook_config"}}

-
+
{{.i18n.Tr "admin.config.queue_length"}}
{{.Webhook.QueueLength}}
{{.i18n.Tr "admin.config.deliver_timeout"}}
@@ -102,7 +102,7 @@
{{.i18n.Tr "admin.config.skip_tls_verify"}}
-
+

{{.i18n.Tr "admin.config.mailer_config"}} @@ -120,7 +120,7 @@
{{.i18n.Tr "admin.config.mailer_user"}}
{{.Mailer.User}}
{{end}} - +

{{.i18n.Tr "admin.config.cache_config"}} @@ -134,7 +134,7 @@
{{.i18n.Tr "admin.config.cache_conn"}}
{{.CacheConn}}
- +

{{.i18n.Tr "admin.config.session_config"}} @@ -156,7 +156,7 @@
{{.i18n.Tr "admin.config.cookie_life_time"}}
{{.SessionConfig.CookieLifeTime}} {{.i18n.Tr "tool.raw_seconds"}}
- +

{{.i18n.Tr "admin.config.picture_config"}} @@ -168,7 +168,7 @@
{{.i18n.Tr "admin.config.disable_gravatar"}}
- +

{{.i18n.Tr "admin.config.log_config"}} @@ -182,7 +182,7 @@
{{.Config}}
{{end}} - +