summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorTomer Kimia <tkimia@purdue.edu>2014-03-04 19:51:46 -0500
committerTomer Kimia <tkimia@purdue.edu>2014-03-04 19:51:46 -0500
commitd73a82b74685df29eb37c1a8b250951827dc164b (patch)
treee9fc3e56cc60e4262f4870e834b7dbc5f13e31d2 /config
parent7ea754bef9e07405a86ce3fc9b0597fef3c1aa35 (diff)
parent6db29eb669a85e5b0aac7a1e8879781a1cb77772 (diff)
I REALLY hope I'm not overwriting anything
Merge branch 'master' of https://github.com/LukeShu/leaguer Conflicts: app/assets/stylesheets/custom.css.scss
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb10
1 files changed, 3 insertions, 7 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 90abea4..2409eb2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,13 +1,7 @@
Leaguer::Application.routes.draw do
- resources :sessions, only: [:new, :create, :destroy]
-
-
#creates sessions as a resource but limits it to these actions
- match '/signup', to: 'users#new', via: 'get'
- match '/signin', to: 'sessions#new', via: 'get'
- match '/signout', to: 'sessions#destroy', via: 'get'
-
+ resources :sessions, only: [:new, :create, :destroy]
resources :users
@@ -23,6 +17,8 @@ Leaguer::Application.routes.draw do
resources :tournaments
+ #set 'selected' to: 'tournaments#selected' via: 'get'
+
resources :servers
root to: 'static#homepage'