diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 22:17:36 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 22:17:36 -0500 |
commit | 5f2247dd1e701a91fb0359bf7265bdadd5486a60 (patch) | |
tree | 8966f53e304731faf26b19230439f831b215d3f1 /config/routes.rb | |
parent | 4a91128f6fe20d95b6692abaa5e6c4dc92418b46 (diff) | |
parent | 2bfc17c39f9b8b5ea71d36d2d5f041295f24192f (diff) |
Merge branch 'master' of github.com:LukeShu/leaguer
Conflicts:
config/routes.rb
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/config/routes.rb b/config/routes.rb index 178b7ad..5c5bece 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,19 +7,17 @@ Leaguer::Application.routes.draw do resources :games - resources :tournaments - resources :pms resources :alerts - resources :teams - - resources :matches + resource :server, only: [:show, :edit, :update] - resources :tournaments + resources :teams + resources :tournaments do + resources :matches + end - resource :server, only: [:show, :edit, :update] root to: 'static#homepage' |