Merge branch 'main' into glitch-soc/merge-upstream

2021-06-23 10:46:24 +02:00
parent a434f370f3 63b807cffc
commit 37fd9670a5
25 changed files with 762 additions and 677 deletions
--- a/app/views/auth/registrations/_sessions.html.haml
+++ b/app/views/auth/registrations/_sessions.html.haml
@ -1,5 +1,7 @@
 %h3= t 'sessions.title'
-%p.muted-hint= t 'sessions.explanation'
+%p.muted-hint
+  = t 'sessions.explanation'
+  = link_to t('sessions.view_authentication_history'), settings_login_activities_path

 %hr.spacer/

@ -29,3 +31,4 @@
          %td
            - if current_session.session_id != session.session_id && !current_account.suspended?
              = table_link_to 'times', t('sessions.revoke'), settings_session_path(session), method: :delete
+