diff options
| author | ThibG <thib@sitedethib.com> | 2020-01-20 19:20:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-20 19:20:40 +0100 |
| commit | a8c109baca4d02cc8aed454e231518c1f8ec1844 (patch) | |
| tree | a828f3968b151924656061bfc709b00565aff877 /app/views/admin/accounts/show.html.haml | |
| parent | ddcf78d8d3e2a8cb9aa04f8ff42f9d8e185b0354 (diff) | |
| parent | dc2ab6e646bb721ef2e1be268b876bd00e8fa802 (diff) | |
Merge pull request #1264 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin/accounts/show.html.haml')
| -rw-r--r-- | app/views/admin/accounts/show.html.haml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml index 9f1e3816b..1429f56d5 100644 --- a/app/views/admin/accounts/show.html.haml +++ b/app/views/admin/accounts/show.html.haml @@ -139,12 +139,12 @@ %time.formatted{ datetime: @account.created_at.iso8601, title: l(@account.created_at) }= l @account.created_at %td - %tr - %th= t('admin.accounts.most_recent_ip') - %td= @account.user_current_sign_in_ip - %td - - if @account.user_current_sign_in_ip - = table_link_to 'search', t('admin.accounts.search_same_ip'), admin_accounts_path(ip: @account.user_current_sign_in_ip) + - @account.user.recent_ips.each_with_index do |(_, ip), i| + %tr + - if i.zero? + %th{ rowspan: @account.user.recent_ips.size }= t('admin.accounts.most_recent_ip') + %td= ip + %td= table_link_to 'search', t('admin.accounts.search_same_ip'), admin_accounts_path(ip: ip) %tr %th= t('admin.accounts.most_recent_activity') |