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

Conflicts: - app/controllers/auth/sessions_controller.rb Upstream reverted something we partially reverted already. Reverted the rest to match upstream.
2018-10-30 17:52:08 +01:00
parent 7e18e95716 66019b0ec4
commit 1c448d6474
15 changed files with 67 additions and 42 deletions
--- a/app/views/auth/registrations/_sessions.html.haml
+++ b/app/views/auth/registrations/_sessions.html.haml
@@ -8,7 +8,7 @@
        %th= t 'sessions.browser'
        %th= t 'sessions.ip'
        %th= t 'sessions.activity'
-        %td
+        %th
    %tbody
      - @sessions.each do |session|
        %tr