diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-30 18:24:38 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-30 18:24:38 -0600 |
| commit | d817c0a958efda990af654f72d15d6f42b43dd49 (patch) | |
| tree | 0cff3632163fadeba3585f56ecdd8d1d919e12c7 /config/routes.rb | |
| parent | 65c87ca0ae20eb5dc62751047bda3e8b11e37ce0 (diff) | |
| parent | 4cca1d1e7efce51eecb64489f412a7b8631f0aed (diff) | |
Merge pull request #291 from glitch-soc/merge-upstream
Merge with upstream @ f4b80e6511f21b60f71ed182bb66ca6ef0ba9f66
Diffstat (limited to 'config/routes.rb')
| -rw-r--r-- | config/routes.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index 5b0ee9324..f45684519 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -255,7 +255,11 @@ Rails.application.routes.draw do resources :apps, only: [:create] - resource :instance, only: [:show] + resource :instance, only: [:show] do + resources :peers, only: [:index], controller: 'instances/peers' + resource :activity, only: [:show], controller: 'instances/activity' + end + resource :domain_blocks, only: [:show, :create, :destroy] resources :follow_requests, only: [:index] do |