diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-07-23 10:17:06 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-07-23 10:51:07 +0200 |
| commit | 444796b69b0cd2c7b4b95d3b3119e0b7a503f682 (patch) | |
| tree | 6607b9d27817f66a1395bcfaea609198015f8973 /app/serializers | |
| parent | 6db5669818cce459b9bb916665541b7b8f5d5155 (diff) | |
| parent | ab3126e7a23125b033ec198cfd83c2178338442c (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/rest/web_push_subscription_serializer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/rest/web_push_subscription_serializer.rb b/app/serializers/rest/web_push_subscription_serializer.rb index 7fd952a56..194cc0a8c 100644 --- a/app/serializers/rest/web_push_subscription_serializer.rb +++ b/app/serializers/rest/web_push_subscription_serializer.rb @@ -4,7 +4,7 @@ class REST::WebPushSubscriptionSerializer < ActiveModel::Serializer attributes :id, :endpoint, :alerts, :server_key def alerts - object.data&.dig('alerts') || {} + (object.data&.dig('alerts') || {}).each_with_object({}) { |(k, v), h| h[k] = ActiveModel::Type::Boolean.new.cast(v) } end def server_key |