diff options
| author | Takeshi Umeda <noel.yoshiba@gmail.com> | 2021-01-10 11:17:55 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-10 11:17:55 +0900 |
| commit | 98a2603dc163210d3a0aab0a0c2b8ef74c7e5eb0 (patch) | |
| tree | 761694d2d697c58faf02a3ff9ef26bf045fc0274 /app/controllers/api/web/push_subscriptions_controller.rb | |
| parent | 7cd4ed7d4298626d2b141cd6d8378e95bc248824 (diff) | |
| parent | 087ed84367537ac168ed3e00bb7eb4bd582dc3d0 (diff) | |
| download | mastodon-feature-limited-visibility-bearcaps.tar mastodon-feature-limited-visibility-bearcaps.tar.gz mastodon-feature-limited-visibility-bearcaps.tar.bz2 mastodon-feature-limited-visibility-bearcaps.zip | |
Merge branch 'master' into feature-limited-visibility-bearcapsfeature-limited-visibility-bearcaps
Diffstat (limited to 'app/controllers/api/web/push_subscriptions_controller.rb')
| -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 |