Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Don't warn when a path segment precedes a required segment. Closes #9615

.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7523 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 16529a92dd6178b5a8a80c91efda796fc2f4d43f 1 parent 4156497
@seckar seckar authored
View
2  actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Don't warn when a path segment precedes a required segment. Closes #9615. [Nicholas Seckar]
+
* Fixed CaptureHelper#content_for to work with the optional content parameter instead of just the block #9434 [sandofsky/wildchild].
* Added Mime::Type.register_alias for dealing with different formats using the same mime type [DHH]. Example:
View
6 actionpack/lib/action_controller/routing.rb
@@ -819,12 +819,16 @@ def regexp_chunk
regexp || "(.*)"
end
+ def optionality_implied?
+ true
+ end
+
class Result < ::Array #:nodoc:
def to_s() join '/' end
def self.new_escaped(strings)
new strings.collect {|str| URI.unescape str}
end
- end
+ end
end
class RouteBuilder #:nodoc:
Please sign in to comment.
Something went wrong with that request. Please try again.