Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream

Conflicts:
- `app/models/account.rb`:
  Upstream added new validations close to lines on which glitch-soc had
  modified validations to handle custom limits set through environment
  variables.
  Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
  Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
  completely different.
  Added `AZURE_ALIAS_HOST` to our version of the file.

app/views/admin/reports/index.html.haml

@@ -27,7 +27,7 @@
       %button.button= t('admin.accounts.search')
       = link_to t('admin.accounts.reset'), admin_reports_path, class: 'button negative'
 
-- @reports.group_by(&:target_account_id).each do |target_account_id, reports|
+- @reports.group_by(&:target_account_id).each do |_target_account_id, reports|
   - target_account = reports.first.target_account
   .report-card
     .report-card__profile

app/views/notification_mailer/_status.html.haml

@@ -33,7 +33,7 @@
                               .auto-dir
                                 = status_content_format(status)
 
-                                - if status.ordered_media_attachments.size > 0
+                                - if status.ordered_media_attachments.size.positive?
                                   %p
                                     - status.ordered_media_attachments.each do |a|
                                       - if status.local?

app/views/settings/applications/_fields.html.haml

@@ -14,5 +14,5 @@
     %label= t('activerecord.attributes.doorkeeper/application.scopes')
     %span.hint= t('simple_form.hints.defaults.scopes')
 
-  - Doorkeeper.configuration.scopes.group_by { |s| s.split(':').first }.each do |k, v|
-    = f.input :scopes, label: false, hint: false, collection: v.sort, wrapper: :with_block_label, include_blank: false, label_method: ->(scope) { safe_join([content_tag(:samp, scope, class: class_for_scope(scope)), content_tag(:span, t("doorkeeper.scopes.#{scope}"), class: 'hint')]) }, selected: f.object.scopes.all, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
+  - Doorkeeper.configuration.scopes.group_by { |s| s.split(':').first }.each do |_key, value|
+    = f.input :scopes, label: false, hint: false, collection: value.sort, wrapper: :with_block_label, include_blank: false, label_method: ->(scope) { safe_join([content_tag(:samp, scope, class: class_for_scope(scope)), content_tag(:span, t("doorkeeper.scopes.#{scope}"), class: 'hint')]) }, selected: f.object.scopes.all, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'

app/views/statuses/_poll.html.haml

@@ -8,7 +8,7 @@
     - poll.loaded_options.each_with_index do |option, index|
       %li
         - if show_results
-          - percent = total_votes_count > 0 ? 100 * option.votes_count / total_votes_count : 0
+          - percent = total_votes_count.positive? ? 100 * option.votes_count / total_votes_count : 0
           %label.poll__option><
             %span.poll__number><
               = "#{percent.round}%"

app/views/statuses/_status.html.haml

@@ -1,61 +1,2 @@
-:ruby
-  pinned          ||= false
-  include_threads ||= false
-  is_predecessor  ||= false
-  is_successor    ||= false
-  direct_reply_id ||= false
-  parent_id       ||= false
-  is_direct_parent  = direct_reply_id == status.id
-  is_direct_child   = parent_id == status.in_reply_to_id
-  centered        ||= include_threads && !is_predecessor && !is_successor
-  h_class           = microformats_h_class(status, is_predecessor, is_successor, include_threads)
-  style_classes     = style_classes(status, is_predecessor, is_successor, include_threads)
-  mf_classes        = microformats_classes(status, is_direct_parent, is_direct_child)
-  entry_classes     = "#{h_class} #{mf_classes} #{style_classes}"
-
-- if status.reply? && include_threads
-  - if @next_ancestor
-    .entry{ class: entry_classes }
-      = link_to_older ActivityPub::TagManager.instance.url_for(@next_ancestor)
-
-  = render partial: 'statuses/status', collection: @ancestors, as: :status, locals: { is_predecessor: true, direct_reply_id: status.in_reply_to_id }
-
-.entry{ class: entry_classes }
-
-  - if status.reblog?
-    .status__prepend
-      .status__prepend-icon-wrapper
-        %i.status__prepend-icon.fa.fa-fw.fa-retweet
-      %span
-        = link_to ActivityPub::TagManager.instance.url_for(status.account), class: 'status__display-name muted' do
-          %bdi
-            %strong.emojify= display_name(status.account, custom_emojify: true)
-        = t('stream_entries.reblogged')
-  - elsif pinned
-    .status__prepend
-      .status__prepend-icon-wrapper
-        %i.status__prepend-icon.fa.fa-fw.fa-thumb-tack
-      %span
-        = t('stream_entries.pinned')
-
-  = render (centered ? 'statuses/detailed_status' : 'statuses/simple_status'), status: status.proper, hide_show_thread: is_predecessor || is_successor
-
-- if include_threads
-  - if @since_descendant_thread_id
-    .entry{ class: entry_classes }
-      = link_to_newer short_account_status_url(status.account.username, status, max_descendant_thread_id: @since_descendant_thread_id + 1)
-  - @descendant_threads.each do |thread|
-    = render partial: 'statuses/status', collection: thread[:statuses], as: :status, locals: { is_successor: true, parent_id: status.id }
-
-    - if thread[:next_status]
-      .entry{ class: entry_classes }
-        = link_to_newer ActivityPub::TagManager.instance.url_for(thread[:next_status])
-  - if @next_descendant_thread
-    .entry{ class: entry_classes }
-      = link_to_newer short_account_status_url(status.account.username, status, since_descendant_thread_id: @max_descendant_thread_id - 1)
-
-- if include_threads && !embedded_view? && !user_signed_in?
-  .entry{ class: entry_classes }
-    = link_to_login class: 'load-more load-gap' do
-      = fa_icon 'comments'
-      = t('statuses.sign_in_to_participate')
+.entry
+  = render (centered ? 'statuses/detailed_status' : 'statuses/simple_status'), status: status.proper, hide_show_thread: false