diff options
| author | ThibG <thib@sitedethib.com> | 2019-12-08 21:27:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-08 21:27:36 +0100 |
| commit | 246addd5b33a172600342af3fb6fb5e4c80ad95e (patch) | |
| tree | 98b87efd3f5f3d41d75482707924fde708c074ec /app/controllers/api/v1/push | |
| parent | 7d59e25fbd7a0209c11cbe6aac4400bbca4de82b (diff) | |
| parent | 49027ee948bc76cc89214f8f340d353763796f1d (diff) | |
Merge pull request #1251 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/push')
| -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 1b658f870..1cbc92b93 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, :poll]) + params.require(:data).permit(alerts: [:follow, :follow_request, :favourite, :reblog, :mention, :poll]) end end |