diff --git a/rhodecode/lib/auth_ldap.py b/rhodecode/lib/auth_ldap.py
--- a/rhodecode/lib/auth_ldap.py
+++ b/rhodecode/lib/auth_ldap.py
@@ -75,7 +75,7 @@ class AuthLdap(object):
if "," in username:
raise LdapUsernameError("invalid character in username: ,")
try:
- ldap.set_option(ldap.OPT_X_TLS_CACERTFILE, '/etc/openldap/cacerts')
+ ldap.set_option(ldap.OPT_X_TLS_CACERTDIR, '/etc/openldap/cacerts')
ldap.set_option(ldap.OPT_NETWORK_TIMEOUT, 10)
server = ldap.initialize(self.LDAP_SERVER)
if self.ldap_version == 2:
diff --git a/rhodecode/templates/admin/users/users.html b/rhodecode/templates/admin/users/users.html
--- a/rhodecode/templates/admin/users/users.html
+++ b/rhodecode/templates/admin/users/users.html
@@ -50,7 +50,8 @@
${h.bool2icon(user.is_ldap)} |
${h.form(url('user', id=user.user_id),method='delete')}
- ${h.submit('remove','delete',id="remove_user_%s" % user.user_id,class_="delete_icon action_button")}
+ ${h.submit('remove_','delete',id="remove_user_%s" % user.user_id,
+ class_="delete_icon action_button",onclick="return confirm('Confirm to delete this user');")}
${h.end_form()}
|
diff --git a/rhodecode/templates/summary/summary.html b/rhodecode/templates/summary/summary.html
--- a/rhodecode/templates/summary/summary.html
+++ b/rhodecode/templates/summary/summary.html
@@ -569,7 +569,7 @@ E.onDOMReady(function(e){
-
${h.link_to(_('Last ten changes'),h.url('shortlog_home',repo_name=c.repo_name))}
+
${h.link_to(_('Shortlog'),h.url('shortlog_home',repo_name=c.repo_name))}