diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-09-03 14:33:06 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-09-03 14:33:06 +0200 |
commit | 6c233a04a04f674b1be75ce7c6c4547c7a006797 (patch) | |
tree | 24b32d52e098fac57e91fd26be1311b7b677c9c9 /app/helpers/admin | |
parent | e915bc3e9e32e34bf80d1bd66ee3f80d2ca37969 (diff) | |
parent | ccc2f608c5c1caac2ea4796f4490f29d59d67068 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: README.md Discarded upstream changes to the README, kept our version.
Diffstat (limited to 'app/helpers/admin')
-rw-r--r-- | app/helpers/admin/account_moderation_notes_helper.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/helpers/admin/account_moderation_notes_helper.rb b/app/helpers/admin/account_moderation_notes_helper.rb index 49e764cef..25586fbba 100644 --- a/app/helpers/admin/account_moderation_notes_helper.rb +++ b/app/helpers/admin/account_moderation_notes_helper.rb @@ -2,6 +2,8 @@ module Admin::AccountModerationNotesHelper def admin_account_link_to(account) + return if account.nil? + link_to admin_account_path(account.id), class: name_tag_classes(account) do safe_join([ image_tag(account.avatar.url, width: 15, height: 15, alt: display_name(account), class: 'avatar'), @@ -11,6 +13,8 @@ module Admin::AccountModerationNotesHelper end def admin_account_inline_link_to(account) + return if account.nil? + link_to admin_account_path(account.id), class: name_tag_classes(account, true) do content_tag(:span, account.acct, class: 'username') end |