gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into user_openid_management

Browse source
This commit is contained in:
Stella Rouzi 2017-06-13 10:25:08 +03:00 • committed by GitHub
commit 2e922650a7
22 changed files with 426 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config/routes.rb
View file

@ -20,6 +20,7 @@ Osem::Application.routes.draw do
end
namespace :admin do
resources :organizations
resources :users do
member do
patch :toggle_confirmation
@ -104,7 +105,7 @@ Osem::Application.routes.draw do
get '/revision_history/:id/revert_object' => 'versions#revert_object', as: 'revision_history_revert_object'
get '/revision_history/:id/revert_attribute' => 'versions#revert_attribute', as: 'revision_history_revert_attribute'
end
resources :organizations, only: [:index]
resources :conferences, only: [:index, :show] do
resource :program, only: [] do
resources :proposals, except: :destroy do