tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #942: Seamless LDAP login (#6556)

Browse Source
This commit is contained in:
Eugen Rochko
2018-02-28 19:04:53 +01:00
committed by GitHub
parent e852872846
commit 47bdb9b33b
12 changed files with 117 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/auth/sessions/new.html.haml
View File

@ -5,7 +5,7 @@
= render partial: 'shared/og'
= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
- if use_pam?
- if use_seamless_external_login?
= f.input :email, autofocus: true, placeholder: t('simple_form.labels.defaults.username_or_email'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.username_or_email') }
- else
= f.input :email, autofocus: true, placeholder: t('simple_form.labels.defaults.email'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.email') }