diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-26 09:24:22 +0000 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-09-28 10:41:54 -0500 |
| commit | bf33184dc0850bf65eb625210159c5831b9ca3ad (patch) | |
| tree | 7c6a6e1badea93ed059f802e3861f965ac55a11d | |
| parent | 7b7b1fac04552c11cd84f45cf476d1b7c2b92690 (diff) | |
| download | gitlab-ce-bf33184dc0850bf65eb625210159c5831b9ca3ad.tar.gz | |
Merge branch 'ldap' into 'master'
Replace deprecated Devise helper with new helper
Closes #22357
See merge request !6462
| -rw-r--r-- | app/views/devise/sessions/_new_ldap.html.haml | 2 |
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 689cd6ed665..2ef383960f4 100644 --- a/app/views/devise/sessions/_new_ldap.html.haml +++ b/app/views/devise/sessions/_new_ldap.html.haml @@ -1,4 +1,4 @@ -= form_tag(user_omniauth_callback_path(server['provider_name']), id: 'new_ldap_user' ) do += form_tag(omniauth_callback_path(:user, server['provider_name']), id: 'new_ldap_user') do = text_field_tag :username, nil, {class: "form-control top", placeholder: "#{server['label']} Login", autofocus: "autofocus"} = password_field_tag :password, nil, {class: "form-control bottom", placeholder: "Password"} - if devise_mapping.rememberable? |