zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-21 10:16:01 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/108869472-objects_archive' into story/115762063--show-historical-nested

Browse source 
# Conflicts:
#	app/controllers/admin/domain_versions_controller.rb
#	config/locales/en.yml
This commit is contained in:
Vladimir Krylov 2016-03-22 16:03:52 +02:00
commit 5cce1ed2c8
13 changed files with 632 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
config/routes.rb
View file

@ -198,7 +198,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
@ -207,6 +207,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