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

This commit is contained in:
Priit Tark 2015-05-20 16:31:42 +03:00
commit 2863cd6749
36 changed files with 534 additions and 92 deletions

View file

@ -181,8 +181,10 @@ Rails.application.routes.draw do
end
resources :settings
resources :registrars do
resources :api_users
resources :white_ips
collection do
get :search
end