diff options
| author | Reverite <github@reverite.sh> | 2019-06-01 22:29:46 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-06-01 22:29:46 -0700 |
| commit | 846a09a7435fb9eb435e9950175ee0e696ed4909 (patch) | |
| tree | 9f63c888a5c380d17e1c75ad339a8ca0d689717e /app/controllers/api/v1 | |
| parent | fdca8d63efe06675ca890358547fcbe7a42631f0 (diff) | |
| parent | 17fb1c4345348da5a6f9338912824a03d348841f (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/api/v1')
| -rw-r--r-- | app/controllers/api/v1/push/subscriptions_controller.rb | 2 |
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 |