From: Thibaut Girka <thib@sitedethib.com>
Date: Thu, 28 Mar 2019 12:01:33 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=050efbc12650feaac3e833c4dd740bf090e3dae1;p=mastodon.git

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

Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
---

050efbc12650feaac3e833c4dd740bf090e3dae1
diff --cc app/views/stream_entries/_simple_status.html.haml
index 1952128a0,ba22c5340..6d2a408ea
--- a/app/views/stream_entries/_simple_status.html.haml
+++ b/app/views/stream_entries/_simple_status.html.haml
@@@ -24,12 -24,11 +24,12 @@@
        %p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }<
          %span.p-summary> #{Formatter.instance.format_spoiler(status, autoplay: autoplay)}&nbsp;
          %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more')
 -    .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay)
 +    .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }<
 +      = Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay)
  
-   - if status.poll
-     = react_component :poll, disabled: true, poll: ActiveModelSerializers::SerializableResource.new(status.poll, serializer: REST::PollSerializer, scope: current_user, scope_name: :current_user).as_json do
-       = render partial: 'stream_entries/poll', locals: { status: status, poll: status.poll, autoplay: autoplay }
+   - if status.preloadable_poll
+     = react_component :poll, disabled: true, poll: ActiveModelSerializers::SerializableResource.new(status.preloadable_poll, serializer: REST::PollSerializer, scope: current_user, scope_name: :current_user).as_json do
+       = render partial: 'stream_entries/poll', locals: { status: status, poll: status.preloadable_poll, autoplay: autoplay }
    - elsif !status.media_attachments.empty?
      - if status.media_attachments.first.video?
        - video = status.media_attachments.first
diff --cc app/workers/activitypub/distribute_poll_update_worker.rb
index 5536bd744,5eaca6fda..98b227111
--- a/app/workers/activitypub/distribute_poll_update_worker.rb
+++ b/app/workers/activitypub/distribute_poll_update_worker.rb
@@@ -9,7 -9,7 +9,7 @@@ class ActivityPub::DistributePollUpdate
      @status  = Status.find(status_id)
      @account = @status.account
  
-     return if @status.poll.nil? || @status.local_only?
 -    return unless @status.preloadable_poll
++    return if @status.preloadable_poll.nil? || @status.local_only?
  
      ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
        [payload, @account.id, inbox_url]
diff --cc config/locales/pl.yml
index bacb457bf,b7b6e2fad..9470e875a
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@@ -873,8 -817,6 +818,7 @@@ pl
      edit_profile: Edytuj profil
      export: Eksportowanie danych
      featured_tags: Wyróżnione hashtagi
 +    flavours: Odmiany
-     identity_proofs: Dowody tożsamości
      import: Importowanie danych
      migrate: Migracja konta
      notifications: Powiadomienia