tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Thibaut Girka
2019-05-11 18:23:46 +02:00
parent 3ea5c045d7 6d44f2441b
commit 2b97d9d780
12 changed files with 69 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/action_logs/_action_log.html.haml
View File

@@ -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)