summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Smirnov <onlyjob@member.fsf.org>2016-09-21 14:10:21 +1000
committerDmitry Smirnov <onlyjob@member.fsf.org>2016-09-21 14:10:21 +1000
commit0d74154abcbdc56264b20b39ea6f3e4445c6a42c (patch)
tree3a0cc7e1e8d96bad1694cedf6813ec53abd5da56
parent0c7f38bd5b59458a94a9637e06287c8bbbaec82d (diff)
downloadgitlab-ce-0d74154abcbdc56264b20b39ea6f3e4445c6a42c.tar.gz
fix LDAP omniauth regression (Closes: #22357)
~~~~ ActionView::Template::Error (undefined method `user_omniauth_callback_path' ~~~~ Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
-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 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?