aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing/mapper.rb
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-12-291-0/+7
|\
| * Documented about using :path option for resourcesKevin Moore2011-12-281-0/+7
| |
* | Correctly display rack apps with dynamic constraints in RoutesInspectorPiotr Sarnacki2011-12-261-1/+1
|/ | | | | | | | | | | | | If you used dynamic constraint like that: scope :constraint => MyConstraint.new do mount RackApp => "/foo" end routes were not displayed correctly when using `rake routes`. This commit fixes it. If you want nice display of dynamic constraints in `rake routes` output, please just override to_s method in your constraint's class.
* remove checking for non-empty string before calling to_symVasiliy Ermolovich2011-12-241-2/+1
|
* Do not raise an exception if an invalid route was generated automatically.José Valim2011-12-161-3/+11
|
* Fixing incorrect documentation Aviv Ben-Yosef2011-11-301-2/+2
| | | `path_names` can only be used for affecting `new` and `edit`
* Revert "copy options keys to the right place so that undo will work correctly"Aaron Patterson2011-11-191-4/+10
| | | | This reverts commit 3178cc9a80262d3bf7754f3507ef60243b46634f.
* Warning removed for shadowing variableArun Agrawal2011-11-191-1/+1
|
* copy options keys to the right place so that undo will work correctlyAaron Patterson2011-11-181-10/+4
|
* no need for type checkingAaron Patterson2011-11-181-1/+1
|
* cleaning up variable names to match method parameter namesAaron Patterson2011-11-181-6/+8
|
* stop doing is_a? checks on the resource typeAaron Patterson2011-11-181-4/+4
|
* move constants to methods since nothing else is using themAaron Patterson2011-11-181-6/+5
|
* pushing hash validation upAaron Patterson2011-11-181-13/+14
|
* breaking match down to smaller methodsAaron Patterson2011-11-181-19/+22
|
* some refactoring of the match methodAaron Patterson2011-11-181-25/+17
|
* Fix small typos in routing docsAlexey Vakhov2011-11-031-1/+3
|
* Fix typo in constraints method documentationAlexey Vakhov2011-11-011-1/+1
|
* Adds missing closing regex slashes.mjy2011-10-251-2/+2
|
* allow shorthand routes with nested optional parametersDiego Carrion2011-10-101-3/+3
|
* removing backwards compatibility moduleAaron Patterson2011-09-121-3/+3
|
* partially expand the parameters to `match`Aaron Patterson2011-09-121-3/+3
|
* Merge pull request #2577 from rails-noob/masterSantiago Pastorino2011-09-061-1/+3
|\ | | | | Fix double slash at start of paths when mounting an engine at the root.
| * Fix bug #2579.rails-noob2011-09-061-1/+3
| | | | | | | | Avoids double slash at start of paths when mounting an engine at the root.
* | if ... nil? is more expensive than unlessMilan Dobrota2011-09-041-1/+1
| |
* | Fix name of parent resource params when declaring nested resources at routesCarlos Paramio2011-09-011-6/+6
|/
* 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.
* | 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.
* 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}/}
* 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-251-7/+7
|\ | | | | | | | | | | 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-231-1/+1
| |
| * Fixed documentation for scope with path.Anuj Dutta2011-05-221-2/+2
| |
| * fixes code highlight in shallow_path exampleDiego Plentz2011-05-191-4/+4
| |
* | Correct example and expand on description of :shallow option for resourcesAndrew White2011-05-211-3/+7
|/
* minor edits after going through what's new in docrailsXavier Noria2011-05-141-2/+2
|
* Missing an end in routing docsJames Miller2011-05-091-0/+1
|