From: Thibaut Girka <thib@sitedethib.com>
Date: Tue, 5 Mar 2019 18:23:16 +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=f513317ba262d9f5d7aa7dd66f8b61690297e107;p=mastodon.git

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

Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.
---

f513317ba262d9f5d7aa7dd66f8b61690297e107
diff --cc app/models/status.rb
index 4566c0d20,f33130dd6..f576489b4
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@@ -21,8 -21,7 +21,9 @@@
  #  account_id             :bigint(8)        not null
  #  application_id         :bigint(8)
  #  in_reply_to_account_id :bigint(8)
 +#  local_only             :boolean
 +#  full_status_text       :text             default(""), not null
+ #  poll_id                :bigint(8)
  #
  
  class Status < ApplicationRecord
diff --cc app/views/stream_entries/_simple_status.html.haml
index 28b4e3217,68e48edbb..d3441ca90
--- a/app/views/stream_entries/_simple_status.html.haml
+++ b/app/views/stream_entries/_simple_status.html.haml
@@@ -24,10 -24,12 +24,13 @@@
        %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.media_attachments.empty?
+   - 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: { poll: status.poll }
+   - elsif !status.media_attachments.empty?
      - if status.media_attachments.first.video?
        - video = status.media_attachments.first
        = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 610, height: 343, inline: true, alt: video.description do
diff --cc db/schema.rb
index 05d4deb1a,161619dcf..48c00511b
--- a/db/schema.rb
+++ b/db/schema.rb
@@@ -592,7 -608,7 +619,8 @@@ ActiveRecord::Schema.define(version: 20
      t.bigint "account_id", null: false
      t.bigint "application_id"
      t.bigint "in_reply_to_account_id"
 +    t.boolean "local_only"
+     t.bigint "poll_id"
      t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20180106", order: { id: :desc }
      t.index ["in_reply_to_account_id"], name: "index_statuses_on_in_reply_to_account_id"
      t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id"