Merge branch 'master' into glitch-soc/merge

2018-05-14 20:51:50 +02:00
parent 4665965543 03b69ebc45
commit ba7ee67498
36 changed files with 314 additions and 260 deletions
--- a/app/controllers/api/v1/push/subscriptions_controller.rb
+++ b/app/controllers/api/v1/push/subscriptions_controller.rb
@ -20,6 +20,12 @@ class Api::V1::Push::SubscriptionsController < Api::BaseController
    render json: @web_subscription, serializer: REST::WebPushSubscriptionSerializer
  end

+  def show
+    raise ActiveRecord::RecordNotFound if @web_subscription.nil?
+
+    render json: @web_subscription, serializer: REST::WebPushSubscriptionSerializer
+  end
+
  def update
    raise ActiveRecord::RecordNotFound if @web_subscription.nil?