comparison config/routes.rb @ 129:5e974759e8b2 cannam

Merge from the default branch
author Chris Cannam
date Wed, 19 Jan 2011 15:15:02 +0000
parents 07fa8a8b56a8
children 73ff0e6a11b1 cbce1fd3b1b7
comparison
equal deleted inserted replaced
127:32b5adec7422 129:5e974759e8b2
120 end 120 end
121 121
122 map.resources :users, :member => { 122 map.resources :users, :member => {
123 :edit_membership => :post, 123 :edit_membership => :post,
124 :destroy_membership => :post 124 :destroy_membership => :post
125 }, 125 }
126 :except => [:destroy]
127 126
128 # For nice "roadmap" in the url for the index action 127 # For nice "roadmap" in the url for the index action
129 map.connect 'projects/:project_id/roadmap', :controller => 'versions', :action => 'index' 128 map.connect 'projects/:project_id/roadmap', :controller => 'versions', :action => 'index'
130 129
131 map.all_news 'news', :controller => 'news', :action => 'index' 130 map.all_news 'news', :controller => 'news', :action => 'index'