diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-03-02 21:46:44 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-03-02 21:46:44 -0600 |
| commit | 1b8fcd4df52c8d715f89180faea8205310f197ae (patch) | |
| tree | 705b8b59bafdd26cb96983e2da0104e8b7308ea7 /app/views/auth/sessions | |
| parent | ee00da01d2e4cc455b92f1f4a7c9142c73048433 (diff) | |
| parent | ecf06d7e821a4b8f4585f1b6f0e39c595ed047ce (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml
Diffstat (limited to 'app/views/auth/sessions')
| -rw-r--r-- | app/views/auth/sessions/new.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/auth/sessions/new.html.haml b/app/views/auth/sessions/new.html.haml index 1c3a0b6b4..0c9f9d5fe 100644 --- a/app/views/auth/sessions/new.html.haml +++ b/app/views/auth/sessions/new.html.haml @@ -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') } |