summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-09-10 06:39:21 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-09-10 06:39:21 -0700
commit263b8af1c49d54b3475758abda5ac50c0aff42bf (patch)
treeeb5c064403d05a2314ac84e75727e2643c495c29
parent5604613025a9fa247144b6ae0f12e3649ef04bda (diff)
parenta3d22297dcd7b547412cf0284a27ef11f90c20ad (diff)
downloadgitlab-ce-263b8af1c49d54b3475758abda5ac50c0aff42bf.tar.gz
Merge pull request #1423 from u-minor/fix_ldap_login
Fix haml template error for ldap login.
-rw-r--r--app/views/devise/sessions/_new_ldap.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/devise/sessions/_new_ldap.html.haml b/app/views/devise/sessions/_new_ldap.html.haml
index 85010df7a8a..4233aa61ecb 100644
--- a/app/views/devise/sessions/_new_ldap.html.haml
+++ b/app/views/devise/sessions/_new_ldap.html.haml
@@ -15,7 +15,7 @@
$(function() {
$('#new_user').toggle();
});
- = form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :class => "login-box" }) do |f|
+= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :class => "login-box" }) do |f|
= f.text_field :email, :class => "text top", :placeholder => "Email"
= f.password_field :password, :class => "text bottom", :placeholder => "Password"
- if devise_mapping.rememberable?