diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-03-13 15:42:31 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-03-13 15:42:31 +0100 |
| commit | 09791774a594972d410fa72f5e0a256f19f0915a (patch) | |
| tree | b1f8d9e591e95d2a3969b6e6be69ec1a510bc4af | |
| parent | 606d24ff2df157ec70003132d1ead7a47dc32883 (diff) | |
| download | gitlab-ce-09791774a594972d410fa72f5e0a256f19f0915a.tar.gz | |
Use custom LDAP label in LDAP signin form.
| -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 97376c85ece..6342e68805a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -61,6 +61,7 @@ v 7.9.0 (unreleased) - Allow smb:// links in Markdown text. - Filter merge request by title or description at Merge Requests page - Block user if he/she was blocked in Active Directory + - 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' |