diff options
| author | ThibG <thib@sitedethib.com> | 2019-05-11 22:05:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-11 22:05:39 +0200 |
| commit | f6838a28f64a2e1a955d7062d8b4270312df802f (patch) | |
| tree | cd4aab24ff5a6bca9a48bfd0331157232084b823 /app/views | |
| parent | 3ea5c045d712713535f130e4c462a00845946dda (diff) | |
| parent | 93085c273ced0b57cde40406d2044abd2a1ce48c (diff) | |
Merge pull request #1044 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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) |