diff options
| author | ThibG <thib@sitedethib.com> | 2020-09-29 10:29:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-29 10:29:42 +0200 |
| commit | 62e3f588dee75fc6a37457f8218630daad056cba (patch) | |
| tree | 69439eebc4da7137206ee82e6ec3fa21cf8c7ed0 /app/controllers/api/web | |
| parent | 787d5d728923393f12421a480b3c7aee789a11fe (diff) | |
| parent | ccfc2b6dce4bfda283bb6bc968a23fe4a76951d7 (diff) | |
Merge pull request #1430 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/web')
| -rw-r--r-- | app/controllers/api/web/push_subscriptions_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/api/web/push_subscriptions_controller.rb b/app/controllers/api/web/push_subscriptions_controller.rb index 7916b82fa..1dce3e70f 100644 --- a/app/controllers/api/web/push_subscriptions_controller.rb +++ b/app/controllers/api/web/push_subscriptions_controller.rb @@ -22,6 +22,7 @@ class Api::Web::PushSubscriptionsController < Api::Web::BaseController reblog: alerts_enabled, mention: alerts_enabled, poll: alerts_enabled, + status: alerts_enabled, }, } @@ -57,6 +58,6 @@ class Api::Web::PushSubscriptionsController < Api::Web::BaseController end def data_params - @data_params ||= params.require(:data).permit(alerts: [:follow, :follow_request, :favourite, :reblog, :mention, :poll]) + @data_params ||= params.require(:data).permit(alerts: [:follow, :follow_request, :favourite, :reblog, :mention, :poll, :status]) end end |