Merge 16110:16216 from trunk.

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index a998df16ea47e5bc6ce8f1fd54e3baee9c9b4c5a..8e9b01bf9dba9512550cfbe9e602bba5ccc04955 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -116,6 +116,9 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/create-account.html', :controller => 'user', :action => 'new'
   map.connect '/forgot-password.html', :controller => 'user', :action => 'lost_password'
 
+  # permalink
+  map.connect '/go/:code', :controller => 'site', :action => 'permalink', :code => /[a-zA-Z0-9_@]+=*/
+
   # traces  
   map.connect '/traces', :controller => 'trace', :action => 'list'
   map.connect '/traces/page/:page', :controller => 'trace', :action => 'list'