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

Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
parent febcdad2e2 3babf8464b
commit 16ff7c5627
352 changed files with 7151 additions and 2269 deletions
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@ -184,7 +184,7 @@ class PostStatusService < BaseService
  def poll_attributes
    return if @options[:poll].blank?

-    @options[:poll].merge(account: @account)
+    @options[:poll].merge(account: @account, voters_count: 0)
  end

  def scheduled_options