Merge remote-tracking branch 'upstream/develop' into neckbeard

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 ## [Unreleased patch]
+### Changed
+- Polls will be hidden with status content if "Collapse posts with subjects" is enabled and the post is collapsed.
 
 ## [2.1.0] - 2020-08-28
 ### Added

src/components/status_content/status_content.vue

@@ -71,6 +71,10 @@
           v-if="attachmentTypes.includes('unknown')"
           class="icon-doc"
         />
+        <span
+          v-if="status.poll && status.poll.options"
+          class="icon-chart-bar"
+        />
         <span
           v-if="status.card"
           class="icon-link"
@@ -86,7 +90,7 @@
       </a>
     </div>
 
-    <div v-if="status.poll && status.poll.options">
+    <div v-if="status.poll && status.poll.options && !hideSubjectStatus">
       <poll :base-poll="status.poll" />
     </div>