diff --git a/config/database.yml b/config/database.yml index 7131c54..58a5158 100644 --- a/config/database.yml +++ b/config/database.yml @@ -3,7 +3,7 @@ development: &default adapter: mysql - database: rebirth_development + database: pairwise_development pool: 5 timeout: 5000 diff --git a/config/routes.rb b/config/routes.rb index f506fbd..ae5f064 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -14,7 +14,7 @@ ActionController::Routing::Routes.draw do |map| question.resources :items question.resources :prompts, :member => {:skip => :post, :vote => :post}, :collection => {:single => :get, :index => :get} - question.resources :choices, :member => {:flag => :put} + question.resources :choices, :member => {:flag => :put, :votes => :get} end map.resources :algorithms map.connect "/questions/:question_id/prompts/:id/vote/:index", :controller => 'prompts', :action => 'vote' -- libgit2 0.21.2