Merge pull request #87 from tootsuite/master

merge upstream
2017-07-20 11:24:32 -04:00
parent d235224692 1fcdaafa6f
commit e7edb4d1ee
64 changed files with 499 additions and 332 deletions
--- a/app/views/auth/registrations/_sessions.html.haml
+++ b/app/views/auth/registrations/_sessions.html.haml
@ -7,6 +7,7 @@
      %th= t 'sessions.browser'
      %th= t 'sessions.ip'
      %th= t 'sessions.activity'
+      %td
  %tbody
    - @sessions.each do |session|
      %tr
@ -22,3 +23,6 @@
            = t 'sessions.current_session'
          - else
            %time.time-ago{ datetime: session.updated_at.iso8601, title: l(session.updated_at) }= l(session.updated_at)
+        %td
+          - if request.session['auth_id'] != session.session_id
+            = table_link_to 'times', t('sessions.revoke'), settings_session_path(session), method: :delete