aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing
Commit message (Collapse)AuthorAgeFilesLines
* We actually don't need a reverse_merge! here. dup removed was giving error ↵Arun Agrawal2011-08-121-1/+1
| | | | with nil class.
* when calling url_for with a hash, additional (likely unwanted) values (such ↵Andrew Kaspick2011-08-111-1/+1
| | | | as :host) would be returned in the hash... calling #dup on the hash prevents this
* Merge pull request #2327 from cesario/patch-1José Valim2011-07-281-1/+0
|\ | | | | We don't need to require erb here.
| * We don't need to require erb here.Franck Verrot2011-07-281-1/+0
| |
* | Merge pull request #2330 from thedarkone/resources-router-fixJosé Valim2011-07-281-8/+7
|\ \ | |/ |/| Inline resources router fix
| * Make use of the inherited initializer.thedarkone2011-07-281-3/+2
| |
| * There is no need to be destructive with the passed-in options.thedarkone2011-07-281-6/+6
| | | | | | | | This fixes a bug that is caused by Resource/SingletonResource mangling resource options when using inline "multi"-resource declarations.
* | simplify conditionals by assuming hash values will never be `false`Aaron Patterson2011-07-261-10/+2
| |
* | use regular ruby rather than clever rubyAaron Patterson2011-07-261-3/+3
| |
* | fixing wildcard path matching when wildcard is inside parenthesisAaron Patterson2011-07-261-1/+1
| |
* | Allow a route to have :format => trueErik Michaels-Ober2011-07-251-0/+2
| | | | | | | | | | | | When format is true, it is mandatory (as opposed to :format => false). This is currently not possible with resource routes, which automatically make format optional by default.
* | Merge pull request #2245 from ↵Santiago Pastorino2011-07-251-6/+5
|\ \ | | | | | | | | | | | | davidtrogers/constraints_block_passed_to_following_routes_in_same_scope Memoizing @blocks & disposing of constraints options properly
| * | Ensure the constraints block is only applied to the correct routeDave Rogers2011-07-251-6/+5
| |/ | | | | | | | | addresses issue #1907 - any routes that follow a route with a constraints block are inheriting the previous route's constraints.
* / Make polymorphic_url calls go through application helpers again.thedarkone2011-07-251-8/+1
|/ | | | This brings back the ability to overwrite/extend url generating methods in application heleprs.
* Better formatting of route requirements in rake:routes.Hendy Tanata2011-07-161-7/+7
| | | | | | | | | | Previously it was: {:controller=>"photos", :action=>"show", :id=>/[A-Z]\d{5}/} Now it becomes: photos#show {:id=>/[A-Z]\d{5}/}
* TODO fix explicitly loading exceptations, autoload removedVishnu Atrai2011-07-111-0/+1
|
* provide a more explicit message when using url_for with nilDamien Mathieu2011-07-021-1/+3
| | | This fixes the problem of having a non-explicit message when the :location option is not provided in respond_with.
* Removed warning while running test with ruby 1.9.2bagwanpankaj2011-06-141-1/+1
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-111-3/+3
|\
| * shallow_path example updatedganesh2011-06-101-3/+3
| |
* | removed the unnecessary back slashes from the regular expressionRaghunadh2011-06-101-2/+2
| |
* | rafactored the regex related code in the mapper class Raghunadh2011-06-071-4/+7
|/
* fix creating an empty route on 1.8. Closes #1210Damien Mathieu2011-06-011-1/+3
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-252-8/+8
|\ | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb
| * Remove extra white spaces on ActionPack docs.Sebastian Martinez2011-05-232-2/+2
| |
| * Fixed documentation for scope with path.Anuj Dutta2011-05-221-2/+2
| |
| * fixes code highlight in shallow_path exampleDiego Plentz2011-05-191-4/+4
| |
* | removed deprecated methods, and related tests, from ActionPackJosh Kalderimis2011-05-241-7/+0
| |
* | Correct example and expand on description of :shallow option for resourcesAndrew White2011-05-211-3/+7
|/
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-142-29/+30
|\ | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/date_helper.rb railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
| * minor edits after going through what's new in docrailsXavier Noria2011-05-141-2/+2
| |
| * Follow code conventions on docsSebastian Martinez2011-05-101-4/+4
| |
| * Missing an end in routing docsJames Miller2011-05-091-0/+1
| |
| * more fixed-fonts hereSebastian Martinez2011-05-091-23/+23
| |
| * Update the description of the :path option to #resources to reflect that it ↵Jacob Poulsgaard Tjoernholm2011-05-061-2/+2
| | | | | | | | sets the actual path, not a prefix. Most instances were already fixed.
* | prepend the assets route instead of appending, closes #436José Valim2011-05-081-3/+6
|/
* Use #remove_possible_method instead hereSebastian Martinez2011-05-041-2/+3
|
* raise an error if the old router draw method is used, along with a message ↵Josh Kalderimis2011-05-031-0/+5
| | | | advising them to either upgrade their routes or add rails_legacy_mapper to their Gemfile
* Explicitly define main_app proxyPiotr Sarnacki2011-04-251-2/+1
|
* Remove `#among?` from Active SupportPrem Sichanugrist2011-04-131-2/+2
| | | | | | After a long list of discussion about the performance problem from using varargs and the reason that we can't find a great pair for it, it would be best to remove support for it for now. It will come back if we can find a good pair for it. For now, Bon Voyage, `#among?`.
* Change Object#either? to Object#among? -- thanks to @jamesarosen for the ↵David Heinemeier Hansson2011-04-121-2/+2
| | | | suggestion!
* Using Object#in? and Object#either? in various placesPrem Sichanugrist2011-04-111-2/+3
| | | | There're a lot of places in Rails source code which make a lot of sense to switching to Object#in? or Object#either? instead of using [].include?.
* Update the wildcard route to be non-greedy by default, therefore be able to ↵Prem Sichanugrist2011-03-291-1/+7
| | | | | | | | match the (.:format) segment [#6605 state:resolved] After some discussion with Andrew White, it seems like this is a better approach for handling a wildcard route. However, user can still bring back the old behavior by supplying `:format => false` to the route. Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-231-0/+7
|\
| * doc :anchor option for #match in routesGabriel Horner2011-03-151-0/+7
| |
* | Do not show optional (.:format) block for wildcard route [#6605 state:resolved]Prem Sichanugrist2011-03-221-1/+1
| | | | | | | | This will make the output of `rake routes` to be correctly match to the behavior of the application, as the regular expression used to match the path is greedy and won't capture the format part by default
* | use a list to represent the supported verbs for a route objectAaron Patterson2011-03-142-11/+13
| |
* | stop splatting arguments so that we can understand wtf is going onAaron Patterson2011-03-141-2/+3
| |
* | RegexpWithNamedGroups is only used for path_info, so only apply to path infoAaron Patterson2011-03-141-1/+2
|/
* Just define methods directly on the class rather than use the moduleAaron Patterson2011-03-111-14/+5
| | | | | | indirection. clever--