diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-03-18 11:17:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-18 11:17:46 +0100 |
| commit | 00fe0f6cb4a736bbb5e633c567ddf7ac9a09ce69 (patch) | |
| tree | 9ddf09dda84c65904c36dec759834ea446b4ac5d /app/views/auth/sessions | |
| parent | f5daa20f2a90098c9d689c5ec9d95ce9887b3a33 (diff) | |
| parent | 8f97ffe91e79c0418666f64b5830d3e74fcc83ba (diff) | |
Merge pull request #2136 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
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 e98c1ff3d..7914e0157 100644 --- a/app/views/auth/sessions/new.html.haml +++ b/app/views/auth/sessions/new.html.haml @@ -19,7 +19,7 @@ .actions = f.button :button, t('auth.login'), type: :submit -- if devise_mapping.omniauthable? and resource_class.omniauth_providers.any? +- if devise_mapping.omniauthable? && resource_class.omniauth_providers.any? .simple_form.alternative-login %h4= omniauth_only? ? t('auth.log_in_with') : t('auth.or_log_in_with') |