aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2012-08-31 04:45:32 -0700
committerXavier Noria <fxn@hashref.com>2012-08-31 04:45:32 -0700
commitd659406e24608973b02f21e14a140d12b3acc05a (patch)
treed8269a1e3fc59623c71529e7425443df9bdeb9c4
parentc0b696304995628f03a51ad42e41ceede1c704d6 (diff)
parent341f42b076aef74579c7b79d3cb91e5bd1315a8b (diff)
downloadrails-d659406e24608973b02f21e14a140d12b3acc05a.tar.gz
rails-d659406e24608973b02f21e14a140d12b3acc05a.tar.bz2
rails-d659406e24608973b02f21e14a140d12b3acc05a.zip
Merge pull request #7479 from eriko/master
the example for contraint( :ip => XXXX) has an invalid regex
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index f64cff8394..b52f66faf1 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -757,7 +757,7 @@ module ActionDispatch
#
# Routes can also be constrained to an IP or a certain range of IP addresses:
#
- # constraints(:ip => /192.168.\d+.\d+/) do
+ # constraints(:ip => /192\.168\.\d+\.\d+/) do
# resources :posts
# end
#