about summary refs log tree commit diff
path: root/app/controllers/api/v1
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-05-28 17:45:06 +0200
committerThibaut Girka <thib@sitedethib.com>2019-05-28 17:45:06 +0200
commit3d73d76e551193a9beffec7a8cdf67e3d18978cf (patch)
treecf2f72e84c0b99b9130ced6ee1dcd831756e7361 /app/controllers/api/v1
parent1b0ce85e3da4b5c1941f65da7d73258da6eed6d0 (diff)
parentb793722d7d7df856466331729d523c807273b003 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers/api/v1')
-rw-r--r--app/controllers/api/v1/push/subscriptions_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/api/v1/push/subscriptions_controller.rb b/app/controllers/api/v1/push/subscriptions_controller.rb
index 1a19bd0ef..1b658f870 100644
--- 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