From acf094fb0734a1c046a2d68583f95647444a799c Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sat, 20 Feb 2016 14:56:27 -0500 Subject: [PATCH] Minor fix for #2634 Add AttributesInBind option in new auth source form. --- README.md | 2 +- gogs.go | 2 +- models/login.go | 12 ++++++------ templates/.VERSION | 2 +- templates/admin/auth/new.tmpl | 6 ++++++ 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 220e31c6fd..f2005fac95 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true) -##### Current version: 0.8.40 +##### Current version: 0.8.41 | Web | UI | Preview | |:-------------:|:-------:|:-------:| diff --git a/gogs.go b/gogs.go index 1e4241fd76..78b601adb3 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.8.40.0219" +const APP_VER = "0.8.41.0220" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/models/login.go b/models/login.go index df89050965..cbad646d1e 100644 --- a/models/login.go +++ b/models/login.go @@ -28,11 +28,11 @@ type LoginType int // Note: new type must be added at the end of list to maintain compatibility. const ( LOGIN_NOTYPE LoginType = iota - LOGIN_PLAIN - LOGIN_LDAP - LOGIN_SMTP - LOGIN_PAM - LOGIN_DLDAP + LOGIN_PLAIN // 1 + LOGIN_LDAP // 2 + LOGIN_SMTP // 3 + LOGIN_PAM // 4 + LOGIN_DLDAP // 5 ) var ( @@ -42,7 +42,7 @@ var ( var LoginNames = map[LoginType]string{ LOGIN_LDAP: "LDAP (via BindDN)", - LOGIN_DLDAP: "LDAP (simple auth)", + LOGIN_DLDAP: "LDAP (simple auth)", // Via direct bind LOGIN_SMTP: "SMTP", LOGIN_PAM: "PAM", } diff --git a/templates/.VERSION b/templates/.VERSION index 356e27b108..7f6bd55a1c 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.8.40.0219 \ No newline at end of file +0.8.41.0220 \ No newline at end of file diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl index f06d3de7e3..418f21dad8 100644 --- a/templates/admin/auth/new.tmpl +++ b/templates/admin/auth/new.tmpl @@ -120,6 +120,12 @@ +
+
+ + +
+