diff options
| author | ThibG <thib@sitedethib.com> | 2019-05-28 19:33:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-28 19:33:15 +0200 |
| commit | 2f83ffa1bd1a80567c512db79273dc75d32ef069 (patch) | |
| tree | 69cd5f99ace6fbf0118bd46c504b18ba6edef232 /app/controllers/api/v1/push/subscriptions_controller.rb | |
| parent | 1b0ce85e3da4b5c1941f65da7d73258da6eed6d0 (diff) | |
| parent | 56d8faab1856f9cff8520518a145b256e7799c36 (diff) | |
Merge pull request #1073 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/push/subscriptions_controller.rb')
| -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 |