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

Merge pull request #542 from hennevogel/feature-splash

Browse source 
Get rid of the home controller
This commit is contained in:
Henne Vogelsang 2014-11-17 13:55:24 +01:00
commit f21c85ad4b
11 changed files with 64 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/routes.rb
View file

@ -96,7 +96,7 @@ Osem::Application.routes.draw do
end
end
resources :conference, only: [:show] do
resources :conference, only: [:index, :show] do
resources :proposal do
resources :commercials, except: [:show, :index]
resources :event_attachment, controller: 'event_attachments'
@ -138,5 +138,5 @@ Osem::Application.routes.draw do
get '/admin' => redirect('/admin/conference')
root to: 'home#index', via: [:get, :options]
root to: 'conference#index', via: [:get, :options]
end