Merge branch '111396946-blocked_and_reserved_view' into staging

This commit is contained in:
Stas 2016-02-03 17:21:03 +02:00
commit 3178c13fd4
14 changed files with 208 additions and 54 deletions

View file

@ -221,8 +221,16 @@ Rails.application.routes.draw do
resources :settings
resources :blocked_domains
resources :reserved_domains
resources :blocked_domains do
member do
get 'delete'
end
end
resources :reserved_domains do
member do
get 'delete'
end
end
resources :registrars do
resources :api_users