diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-26 09:24:22 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-26 09:24:22 +0000 |
| commit | bb8a41b2cbfcc05f49ca15466d54220be1e20cd5 (patch) | |
| tree | f9976f92b4f1abf3afce8779aa11c19302d69554 | |
| parent | 23ed83a185f611443935c1c68472695b4439fc81 (diff) | |
| parent | 0d74154abcbdc56264b20b39ea6f3e4445c6a42c (diff) | |
| download | gitlab-ce-bb8a41b2cbfcc05f49ca15466d54220be1e20cd5.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? |