diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-03-28 13:01:33 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-28 13:01:33 +0100 |
commit | 050efbc12650feaac3e833c4dd740bf090e3dae1 (patch) | |
tree | 260458c7ff43dd82fc02cc7e5ef0920dd8d2a25b /app/helpers | |
parent | 0418bdd71f59b4d7e9f3498f2990c8b044f310e1 (diff) | |
parent | 24d5b6f9e39d2ac62a9657c7d19bc8c437b0735b (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/workers/activitypub/distribute_poll_update_worker.rb - config/locales/pl.yml
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/admin/filter_helper.rb | 2 | ||||
-rw-r--r-- | app/helpers/stream_entries_helper.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/admin/filter_helper.rb b/app/helpers/admin/filter_helper.rb index 4fd36ef42..0bda25974 100644 --- a/app/helpers/admin/filter_helper.rb +++ b/app/helpers/admin/filter_helper.rb @@ -7,7 +7,7 @@ module Admin::FilterHelper CUSTOM_EMOJI_FILTERS = %i(local remote by_domain shortcode).freeze TAGS_FILTERS = %i(hidden).freeze INSTANCES_FILTERS = %i(limited by_domain).freeze - FOLLOWERS_FILTERS = %i(relationship status by_domain activity).freeze + FOLLOWERS_FILTERS = %i(relationship status by_domain activity order).freeze FILTERS = ACCOUNT_FILTERS + REPORT_FILTERS + INVITE_FILTER + CUSTOM_EMOJI_FILTERS + TAGS_FILTERS + INSTANCES_FILTERS + FOLLOWERS_FILTERS diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb index 1e49e4fc6..5ad2c438e 100644 --- a/app/helpers/stream_entries_helper.rb +++ b/app/helpers/stream_entries_helper.rb @@ -111,8 +111,8 @@ module StreamEntriesHelper end def poll_summary(status) - return unless status.poll - status.poll.options.map { |o| "[ ] #{o}" }.join("\n") + return unless status.preloadable_poll + status.preloadable_poll.options.map { |o| "[ ] #{o}" }.join("\n") end def status_description(status) |