about summary refs log tree commit diff
path: root/app/views/auth
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-04-06 21:10:23 +0200
committerClaire <claire.github-309c@sitedethib.com>2022-04-06 21:10:23 +0200
commitb368c7502931aa06121ecad8a97193b1f17cf90a (patch)
tree2b598363926388d30a4c5c6197436b46f6d4610a /app/views/auth
parent00c9363f07081e0149533023992fba47dd905384 (diff)
parentdd4c156f33a24b8bb89b45b2697aa4036c3ae5be (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Upstream removed this file, while glitch-soc had changes to deal with
  its theming system.
  Removed the file like upstream did.
Diffstat (limited to 'app/views/auth')
-rw-r--r--app/views/auth/sessions/sign_in_token.html.haml14
1 files changed, 0 insertions, 14 deletions
diff --git a/app/views/auth/sessions/sign_in_token.html.haml b/app/views/auth/sessions/sign_in_token.html.haml
deleted file mode 100644
index 8923203cd..000000000
--- a/app/views/auth/sessions/sign_in_token.html.haml
+++ /dev/null
@@ -1,14 +0,0 @@
-- content_for :page_title do
-  = t('auth.login')
-
-= simple_form_for(resource, as: resource_name, url: session_path(resource_name), method: :post) do |f|
-  %p.hint.otp-hint= t('users.suspicious_sign_in_confirmation')
-
-  .fields-group
-    = f.input :sign_in_token_attempt, type: :number, wrapper: :with_label, label: t('simple_form.labels.defaults.sign_in_token_attempt'), input_html: { 'aria-label' => t('simple_form.labels.defaults.sign_in_token_attempt'), :autocomplete => 'off' }, autofocus: true
-
-  .actions
-    = f.button :button, t('auth.login'), type: :submit
-
-  - if Setting.site_contact_email.present?
-    %p.hint.subtle-hint= t('users.generic_access_help_html', email: mail_to(Setting.site_contact_email, nil))