Merge branch 'master' into openstreetbugs

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 2c57f11ca7ce06504f2b66fdf7ce0d06a27ae0e8..5975f48b7ed69bafab2a190cdda7efb6819810c7 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -81,11 +81,14 @@ ActionController::Routing::Routes.draw do |map|
 
   map.connect "api/#{API_VERSION}/bugs", :controller => 'map_bugs', :action => 'get_bugs'
   map.connect "api/#{API_VERSION}/bugs/search", :controller => 'map_bugs', :action => 'search'
+  map.connect "api/#{API_VERSION}/bugs/rss", :controller =>'map_bugs', :action =>'rss'
   map.connect "api/#{API_VERSION}/bug/create", :controller => 'map_bugs', :action => 'add_bug'
   map.connect "api/#{API_VERSION}/bug/:id/comment", :controller => 'map_bugs', :action => 'edit_bug', :id => /\d+/
   map.connect "api/#{API_VERSION}/bug/:id/close", :controller => 'map_bugs', :action => 'close_bug', :id => /\d+/
   map.connect "api/#{API_VERSION}/bug/:id", :controller => 'map_bugs', :action => 'read', :id => /\d+/, :conditions => { :method => :get }
   map.connect "api/#{API_VERSION}/bug/:id", :controller => 'map_bugs', :action => 'delete', :id => /\d+/, :conditions => { :method => :delete }
+
+  map.connect '/user/:display_name/bugs', :controller => 'map_bugs', :action => 'my_bugs'