diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-06-28 11:11:18 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-06-28 11:11:18 +0200 |
commit | fe5f6bc7edf42e8c87dbdfa98f5707020e42d400 (patch) | |
tree | 2e632dfa964aad5cf118930389cf95904f3bd82a /app/controllers/api/v1/push/subscriptions_controller.rb | |
parent | 63f79874b59b3ba28c0f940b9d36ea7aacb44c93 (diff) | |
parent | 02851848e964675bb59919fa5fd1bdee2c1c29db (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property
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 47f2e6440..7148d63a4 100644 --- a/app/controllers/api/v1/push/subscriptions_controller.rb +++ b/app/controllers/api/v1/push/subscriptions_controller.rb @@ -52,6 +52,6 @@ class Api::V1::Push::SubscriptionsController < Api::BaseController def data_params return {} if params[:data].blank? - params.require(:data).permit(:policy, alerts: [:follow, :follow_request, :favourite, :reblog, :mention, :poll, :status]) + params.require(:data).permit(:policy, alerts: Notification::TYPES) end end |