diff options
author | ThibG <thib@sitedethib.com> | 2020-04-05 00:16:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-05 00:16:23 +0200 |
commit | 6e426267a762f3cd1efa2c5fb120a13543567775 (patch) | |
tree | 2a71acb5433eece834df66c179e924eb34df38fb /app/views/admin/action_logs/_action_log.html.haml | |
parent | 5c5317041f17375666bfaf4788f0adf71804b47d (diff) | |
parent | ec6464f8d0bba52e3bfb8f0afc9531ce80238000 (diff) |
Merge pull request #1311 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin/action_logs/_action_log.html.haml')
-rw-r--r-- | app/views/admin/action_logs/_action_log.html.haml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/app/views/admin/action_logs/_action_log.html.haml b/app/views/admin/action_logs/_action_log.html.haml index a545e189e..59905f341 100644 --- a/app/views/admin/action_logs/_action_log.html.haml +++ b/app/views/admin/action_logs/_action_log.html.haml @@ -7,9 +7,3 @@ = 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.formatted{ datetime: action_log.created_at.iso8601 } - .spacer - .log-entry__icon - = fa_icon icon_for_log(action_log) - .log-entry__icon__overlay{ class: class_for_log_icon(action_log) } - .log-entry__extras - = log_extra_attributes relevant_log_changes(action_log) |