Merge branch 'ldap-form' into 'master'

Use custom LDAP label in LDAP signin form.

Addresses https://dev.gitlab.org/gitlab/gitlab-ee/issues/238

![Screen_Shot_2015-03-13_at_15.43.19](https://dev.gitlab.org/gitlab/gitlabhq/uploads/e9f0d1ed7238701ecdbaa54d4f538d89/Screen_Shot_2015-03-13_at_15.43.19.png)

See merge request !1693

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

app/views/devise/sessions/_new_ldap.html.haml

-= 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"

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'