Commit 22da02ab authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'minor-fix-in-new-ldap-view' into 'master'

Fix Login -> Username in LDAP sign-in form

Little mistake I did when merging CE->EE, `Login` should be `Username` (see the CE MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6947/diffs#c2bdcb101cb41d9cda1c4d451e9323a0dc694be2_4_3)

See merge request !806
parents 3c425b30 b6c1bc95
= form_tag(omniauth_callback_path(:user, server['provider_name']), id: 'new_ldap_user', class: "show-gl-field-errors") do = form_tag(omniauth_callback_path(:user, server['provider_name']), id: 'new_ldap_user', class: "show-gl-field-errors") do
.form-group .form-group
= label_tag :username, "#{server['label']} Login" = label_tag :username, "#{server['label']} Username"
= text_field_tag :username, nil, {class: "form-control top", title: "This field is required.", autofocus: "autofocus", required: true } = text_field_tag :username, nil, {class: "form-control top", title: "This field is required.", autofocus: "autofocus", required: true }
.form-group .form-group
= label_tag :password = label_tag :password
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment