diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-13 16:36:08 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-13 16:36:08 +0000 |
| commit | d37d7ffc1b617f8d75959c05f77727e14ac4e353 (patch) | |
| tree | 76ab53d27a715c72d521134cbbf93215a794f2b6 | |
| parent | 823e5457d01037d09932d7b91069ad2e28a36af0 (diff) | |
| parent | 09791774a594972d410fa72f5e0a256f19f0915a (diff) | |
| download | gitlab-ce-d37d7ffc1b617f8d75959c05f77727e14ac4e353.tar.gz | |
Merge branch 'ldap-form' into 'master'
Use custom LDAP label in LDAP signin form.
Addresses https://dev.gitlab.org/gitlab/gitlab-ee/issues/238
See merge request !1693
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/devise/sessions/_new_ldap.html.haml | 6 | ||||
| -rw-r--r-- | app/views/devise/shared/_signin_box.html.haml | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG index e7a9218d7ac..aa47047b326 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -63,6 +63,7 @@ v 7.9.0 (unreleased) - Filter merge request by title or description at Merge Requests page - Block user if he/she was blocked in Active Directory - Fix import pages not working after first load. + - Use custom LDAP label in LDAP signin form. v 7.8.4 - Fix issue_tracker_id substitution in custom issue trackers diff --git a/app/views/devise/sessions/_new_ldap.html.haml b/app/views/devise/sessions/_new_ldap.html.haml index e986989a728..812e22373a7 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(provider), id: 'new_ldap_user' ) do - = text_field_tag :username, nil, {class: "form-control top", placeholder: "LDAP Login", autofocus: "autofocus"} += form_tag(user_omniauth_callback_path(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"} - = button_tag "LDAP Sign in", class: "btn-save btn" + = button_tag "#{server['label']} Sign in", class: "btn-save btn" diff --git a/app/views/devise/shared/_signin_box.html.haml b/app/views/devise/shared/_signin_box.html.haml index 8faa6398a60..c76574db457 100644 --- a/app/views/devise/shared/_signin_box.html.haml +++ b/app/views/devise/shared/_signin_box.html.haml @@ -17,7 +17,7 @@ .tab-content - @ldap_servers.each_with_index do |server, i| %div.tab-pane{id: "tab-#{server['provider_name']}", class: (:active if i.zero?)} - = render 'devise/sessions/new_ldap', provider: server['provider_name'] + = render 'devise/sessions/new_ldap', server: server - if signin_enabled? %div#tab-signin.tab-pane = render 'devise/sessions/new_base' |