Merging from main master to my repo master. #4

Closed
Karavel wants to merge 53 commits from fixin.me/fixin.me:master into master
Showing only changes of commit aebbe11bef - Show all commits

View File

@ -3,22 +3,19 @@ Rails.application.routes.draw do
controllers: {registrations: :registrations} controllers: {registrations: :registrations}
resources :units, except: [:show], path_names: {new: '(/:id)/new'} do resources :units, except: [:show], path_names: {new: '(/:id)/new'} do
member do member { post :rebase }
post :rebase
end
end end
namespace :default do namespace :default do
resources :units, only: :index resources :units, only: [:index, :destroy] do
member { post :import, :export }
collection { post :import_all }
end
end end
resources :users, only: [:index, :show, :update] do resources :users, only: [:index, :show, :update] do
member do member { get :disguise }
get :disguise collection { get :revert }
end
collection do
get :revert
end
end end
devise_scope :user do devise_scope :user do