diff options
author | Unknwon <u@gogs.io> | 2015-11-21 12:58:31 -0500 |
---|---|---|
committer | Unknwon <u@gogs.io> | 2015-11-21 12:58:31 -0500 |
commit | eea2e05da65c66d9739cecbad77741a0b7c320b0 (patch) | |
tree | 1ab1e2e6b5ffef922e87ae2da5ab3f8fed0312bd | |
parent | 2b1e955f91655930bcc65dca698b4281d8e61ce1 (diff) | |
download | gitea-eea2e05da65c66d9739cecbad77741a0b7c320b0.tar.gz gitea-eea2e05da65c66d9739cecbad77741a0b7c320b0.zip |
minor fix on #1694
-rw-r--r-- | gogs.go | 2 | ||||
-rw-r--r-- | models/login.go | 7 | ||||
-rw-r--r-- | templates/.VERSION | 2 | ||||
-rw-r--r-- | templates/admin/config.tmpl | 30 |
4 files changed, 20 insertions, 21 deletions
@@ -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"}} </h4> <div class="ui attached table segment"> - <dl class="dl-horizontal admin-dl-horizontal"> + <dl class="dl-horizontal admin-dl-horizontal"> <dt>{{.i18n.Tr "admin.config.app_name"}}</dt> <dd>{{AppName}}</dd> <dt>{{.i18n.Tr "admin.config.app_ver"}}</dt> @@ -22,12 +22,12 @@ <dd><i class="fa fa{{if .OfflineMode}}-check{{end}}-square-o"></i></dd> <dt>{{.i18n.Tr "admin.config.disable_router_log"}}</dt> <dd><i class="fa fa{{if .DisableRouterLog}}-check{{end}}-square-o"></i></dd> - <hr/> + <div class="ui divider"></div> <dt>{{.i18n.Tr "admin.config.run_user"}}</dt> <dd>{{.RunUser}}</dd> <dt>{{.i18n.Tr "admin.config.run_mode"}}</dt> <dd>{{.RunMode}}</dd> - <hr/> + <div class="ui divider"></div> <dt>{{.i18n.Tr "admin.config.repo_root_path"}}</dt> <dd>{{.RepoRootPath}}</dd> <dt>{{.i18n.Tr "admin.config.static_file_root_path"}}</dt> @@ -39,7 +39,7 @@ <dt>{{.i18n.Tr "admin.config.reverse_auth_user"}}</dt> <dd>{{.ReverseProxyAuthUser}}</dd> </dl> - </div> + </div> <h4 class="ui top attached header"> {{.i18n.Tr "admin.config.db_config"}} @@ -59,13 +59,13 @@ <dt>{{.i18n.Tr "admin.config.db_path"}}</dt> <dd>{{.DbCfg.Path}} {{.i18n.Tr "admin.config.db_path_helper"}}</dd> </dl> - </div> + </div> <h4 class="ui top attached header"> {{.i18n.Tr "admin.config.service_config"}} </h4> <div class="ui attached table segment"> - <dl class="dl-horizontal admin-dl-horizontal"> + <dl class="dl-horizontal admin-dl-horizontal"> <dt>{{.i18n.Tr "admin.config.register_email_confirm"}}</dt> <dd><i class="fa fa{{if .Service.RegisterEmailConfirm}}-check{{end}}-square-o"></i></dd> <dt>{{.i18n.Tr "admin.config.disable_register"}}</dt> @@ -82,19 +82,19 @@ <dd><i class="fa fa{{if .Service.DisableMinimumKeySizeCheck}}-check{{end}}-square-o"></i></dd> <dt>{{.i18n.Tr "admin.config.enable_captcha"}}</dt> <dd><i class="fa fa{{if .Service.EnableCaptcha}}-check{{end}}-square-o"></i></dd> - <hr/> + <div class="ui divider"></div> <dt>{{.i18n.Tr "admin.config.active_code_lives"}}</dt> <dd>{{.Service.ActiveCodeLives}} {{.i18n.Tr "tool.raw_minutes"}}</dd> <dt>{{.i18n.Tr "admin.config.reset_password_code_lives"}}</dt> <dd>{{.Service.ResetPwdCodeLives}} {{.i18n.Tr "tool.raw_minutes"}}</dd> </dl> - </div> + </div> <h4 class="ui top attached header"> {{.i18n.Tr "admin.config.webhook_config"}} </h4> <div class="ui attached table segment"> - <dl class="dl-horizontal admin-dl-horizontal"> + <dl class="dl-horizontal admin-dl-horizontal"> <dt>{{.i18n.Tr "admin.config.queue_length"}}</dt> <dd>{{.Webhook.QueueLength}}</dd> <dt>{{.i18n.Tr "admin.config.deliver_timeout"}}</dt> @@ -102,7 +102,7 @@ <dt>{{.i18n.Tr "admin.config.skip_tls_verify"}}</dt> <dd><i class="fa fa{{if .Webhook.SkipTLSVerify}}-check{{end}}-square-o"></i></dd> </dl> - </div> + </div> <h4 class="ui top attached header"> {{.i18n.Tr "admin.config.mailer_config"}} @@ -120,7 +120,7 @@ <dt>{{.i18n.Tr "admin.config.mailer_user"}}</dt> <dd>{{.Mailer.User}}</dd>{{end}} </dl> - </div> + </div> <h4 class="ui top attached header"> {{.i18n.Tr "admin.config.cache_config"}} @@ -134,7 +134,7 @@ <dt>{{.i18n.Tr "admin.config.cache_conn"}}</dt> <dd><pre>{{.CacheConn}}</pre></dd> </dl> - </div> + </div> <h4 class="ui top attached header"> {{.i18n.Tr "admin.config.session_config"}} @@ -156,7 +156,7 @@ <dt>{{.i18n.Tr "admin.config.cookie_life_time"}}</dt> <dd>{{.SessionConfig.CookieLifeTime}} {{.i18n.Tr "tool.raw_seconds"}}</dd> </dl> - </div> + </div> <h4 class="ui top attached header"> {{.i18n.Tr "admin.config.picture_config"}} @@ -168,7 +168,7 @@ <dt>{{.i18n.Tr "admin.config.disable_gravatar"}}</dt> <dd><i class="fa fa{{if .DisableGravatar}}-check{{end}}-square-o"></i></dd> </dl> - </div> + </div> <h4 class="ui top attached header"> {{.i18n.Tr "admin.config.log_config"}} @@ -182,7 +182,7 @@ <dd><pre>{{.Config}}</pre></dd> {{end}} </dl> - </div> + </div> </div> </div> </div> |