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

2019-05-28 17:45:06 +02:00
parent 1b0ce85e3d b793722d7d
commit 3d73d76e55
21 changed files with 94 additions and 110 deletions
--- a/app/controllers/api/v1/push/subscriptions_controller.rb
+++ b/app/controllers/api/v1/push/subscriptions_controller.rb
@@ -51,6 +51,6 @@ class Api::V1::Push::SubscriptionsController < Api::BaseController

  def data_params
    return {} if params[:data].blank?
-    params.require(:data).permit(alerts: [:follow, :favourite, :reblog, :mention])
+    params.require(:data).permit(alerts: [:follow, :favourite, :reblog, :mention, :poll])
  end
 end