minor fix on #1694

diff --git a/gogs.go b/gogs.go
index 8059086bfaa7320724411451ea8e066fae162dba..e54eba8289bafa98a63182b025a50d10b2abf4d2 100644 (file)
--- 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 79a262c5752d1e8d8a5c66d47680bb1145ba96c7..011d946a4715a763e9189dd0efc8f2347525ad9c 100644 (file)
--- 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 8c46b68d5fcbeed560a5e77790517f7e1c34afe3..d5e407396fd271c5160b3ef1a48a7d88f0f8c32a 100644 (file)
--- 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 571ea1a99ee6c47d6d591bbc610ead7ed894be12..1a4efa8f1cb35042a1583283f7fc9af163719dac 100644 (file)
--- 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>