Merge that good fresh upstream shit

2017-07-22 01:16:53 +00:00
parent 0244019ca1 8d6c3cd48a
commit 984d2d4cb6
21 changed files with 253 additions and 23 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -88,7 +88,12 @@ Rails.application.routes.draw do
    resources :subscriptions, only: [:index]
    resources :domain_blocks, only: [:index, :new, :create, :show, :destroy]
    resource :settings, only: [:edit, :update]
-    resources :instances, only: [:index]
+    
+    resources :instances, only: [:index] do
+      collection do
+        post :resubscribe
+      end
+    end

    resources :reports, only: [:index, :show, :update] do
      resources :reported_statuses, only: [:create, :update, :destroy]