Merge branch 'master' of github.com:domify/registry

Conflicts:
	config/locales/en.yml
	db/schema.rb
This commit is contained in:
Martin Lensment 2015-05-19 17:26:32 +03:00
commit 2fb632b7a9
21 changed files with 298 additions and 54 deletions

View file

@ -57,11 +57,12 @@ Rails.application.routes.draw do
end
end
resources :nameservers do
collection do
match 'replace_all', via: [:post, :get]
end
end
# turned off requested by client
# resources :nameservers do
# collection do
# match 'replace_all', via: [:post, :get]
# end
# end
resources :contacts do
member do
@ -105,6 +106,7 @@ Rails.application.routes.draw do
# resources :account_activities
resources :domain_update_confirms
resources :domain_delete_confirms
devise_scope :user do
get 'login' => 'sessions#login'