diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-26 02:05:53 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-26 02:05:53 -0800 |
| commit | 133c349b0af1c46d26f83c19e6b583062db931e4 (patch) | |
| tree | 7b4a02ea90b09a2ad90ae013d5880e56e397611c /actionpack/lib/action_controller/routing/builder.rb | |
| parent | a88094fd7a19a4b2d5c5b5044b10146e6c5c7245 (diff) | |
| parent | fef6c32afe2276dffa0347e25808a86e7a101af1 (diff) | |
| download | rails-133c349b0af1c46d26f83c19e6b583062db931e4.tar.gz rails-133c349b0af1c46d26f83c19e6b583062db931e4.tar.bz2 rails-133c349b0af1c46d26f83c19e6b583062db931e4.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/routing/builder.rb')
| -rw-r--r-- | actionpack/lib/action_controller/routing/builder.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/routing/builder.rb b/actionpack/lib/action_controller/routing/builder.rb index d4e501e780..44d759444a 100644 --- a/actionpack/lib/action_controller/routing/builder.rb +++ b/actionpack/lib/action_controller/routing/builder.rb @@ -34,6 +34,8 @@ module ActionController def segment_for(string) segment = case string + when /\A\.(:format)?\// + OptionalFormatSegment.new when /\A:(\w+)/ key = $1.to_sym key == :controller ? ControllerSegment.new(key) : DynamicSegment.new(key) |