diff options
| author | Evan Minto <evan.minto@gmail.com> | 2017-04-25 06:06:06 -0700 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-25 15:06:06 +0200 |
| commit | 122d59ac41a0c637b19357c2b7422002ffa0381c (patch) | |
| tree | 150a8793fcc7d51793a24b2b1df900025799dc73 /app/helpers | |
| parent | 8b5179d006a07cf759e751e9d883bfe472cee868 (diff) | |
Change ActivityPub paging to match spec. Clean up ActivityPub outbox changes. (#2410)
* Change ActivityPub paging to match spec. Clean up ActivityPub outbox changes. * Fix code style and test failures for OutboxController. * Attempt to fix CI errors.
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/activitystreams2_builder_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/activitystreams2_builder_helper.rb b/app/helpers/activitystreams2_builder_helper.rb index eeada56f2..717b470f0 100644 --- a/app/helpers/activitystreams2_builder_helper.rb +++ b/app/helpers/activitystreams2_builder_helper.rb @@ -3,6 +3,6 @@ module Activitystreams2BuilderHelper # Gets a usable name for an account, using display name or username. def account_name(account) - account.display_name.empty? ? account.username : account.display_name + account.display_name.presence || account.username end end |