diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-05-11 18:23:46 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-05-11 18:23:46 +0200 |
| commit | 2b97d9d780fd3326a470693164f71464c106d4ca (patch) | |
| tree | 38feb32acfc878f51f1cca59fd1da6f90e87da19 /app/views | |
| parent | 3ea5c045d712713535f130e4c462a00845946dda (diff) | |
| parent | 6d44f2441bf2aa14d11e481d9d2cfe82a74d81ed (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/action_logs/_action_log.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/action_logs/_action_log.html.haml b/app/views/admin/action_logs/_action_log.html.haml index f059814bd..a545e189e 100644 --- a/app/views/admin/action_logs/_action_log.html.haml +++ b/app/views/admin/action_logs/_action_log.html.haml @@ -6,7 +6,7 @@ .log-entry__title = t("admin.action_logs.actions.#{action_log.action}_#{action_log.target_type.underscore}", name: content_tag(:span, action_log.account.username, class: 'username'), target: content_tag(:span, log_target(action_log), class: 'target')).html_safe .log-entry__timestamp - %time= l action_log.created_at + %time.formatted{ datetime: action_log.created_at.iso8601 } .spacer .log-entry__icon = fa_icon icon_for_log(action_log) |