Merge pull request from nverba/patch-1

Update config/routes.rb
This commit is contained in:
Robin Ward 2013-02-25 14:22:35 -08:00
commit c69cac517a
1 changed files with 0 additions and 6 deletions
config

View File

@ -118,12 +118,6 @@ Discourse::Application.routes.draw do
match "/auth/:provider/callback", to: "users/omniauth_callbacks#complete" match "/auth/:provider/callback", to: "users/omniauth_callbacks#complete"
match "/auth/failure", to: "users/omniauth_callbacks#failure" match "/auth/failure", to: "users/omniauth_callbacks#failure"
get 'twitter/frame' => 'twitter#frame'
get 'twitter/complete' => 'twitter#complete'
get 'facebook/frame' => 'facebook#frame'
get 'facebook/complete' => 'facebook#complete'
resources :clicks do resources :clicks do
collection do collection do
get 'track' get 'track'