Merge branch '108869472-objects_archive' into staging

This commit is contained in:
Stas 2016-02-10 17:46:19 +02:00
commit fea6f046e6
10 changed files with 398 additions and 12 deletions

View file

@ -210,7 +210,7 @@ Rails.application.routes.draw do
end
resources :domains do
resources :domain_versions
resources :domain_versions, controller: 'domains', action: 'versions'
resources :pending_updates
resources :pending_deletes
member do
@ -219,6 +219,18 @@ Rails.application.routes.draw do
end
end
resources :domain_versions do
collection do
get 'search'
end
end
resources :contact_versions do
collection do
get 'search'
end
end
resources :settings
resources :blocked_domains do