zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-20 11:19:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into 105842700-registrants_portal

Browse source 
# Conflicts:
#	config/locales/en.yml
This commit is contained in:
Vladimir Krylov 2016-03-04 12:44:16 +02:00
commit 6f0360bae6
104 changed files with 2232 additions and 864 deletions
Download patch file Download diff file Expand all files Collapse all files

13
config/routes.rb
View file

@ -74,6 +74,7 @@ Rails.application.routes.draw do
collection do
get 'check'
get 'download_list'
end
end
@ -225,8 +226,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