Merge branch 'master' into registry-927

This commit is contained in:
Maciej Szlosarczyk 2018-08-31 14:25:59 +03:00
commit 2636fe2525
No known key found for this signature in database
GPG key ID: 41D62D42D3B0D765
40 changed files with 313 additions and 105 deletions

View file

@ -192,12 +192,16 @@ Rails.application.routes.draw do
match 'forward', via: [:post, :get]
end
resources :domains do
resources :domains, except: %i[new create destroy] do
resources :domain_versions, controller: 'domains', action: 'versions'
resources :pending_updates
resources :pending_deletes
resource :force_delete, controller: 'domains/force_delete', only: %i[create destroy]
resource :registry_lock, controller: 'domains/registry_lock', only: :destroy
member do
patch :keep
end
end
resources :domain_versions do
@ -264,4 +268,4 @@ Rails.application.routes.draw do
# To prevent users seeing the default welcome message "Welcome aboard" from Rails
root to: redirect('admin/sign_in')
end
end