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/config/routes.rb
+++ b/config/routes.rb
@@ -326,7 +326,7 @@ Rails.application.routes.draw do
      end

      namespace :push do
-        resource :subscription, only: [:create, :update, :destroy]
+        resource :subscription, only: [:create, :show, :update, :destroy]
      end
    end