Change text_field to :login from :email in line with 9d92433a7c83432657faf4c02839bba1ba6f22ac to allow login as admin or non-ldap user when ldap is enabled
Also change haml style in line with that commit
Merge remote-tracking branch 'refs/remotes/gitlabhq/5-1-stable'