| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | We actually don't need a reverse_merge! here. dup removed was giving error ↵ | Arun Agrawal | 2011-08-12 | 1 | -1/+1 |
| | | | | | with nil class. | ||||
| * | when calling url_for with a hash, additional (likely unwanted) values (such ↵ | Andrew Kaspick | 2011-08-11 | 1 | -1/+1 |
| | | | | | as :host) would be returned in the hash... calling #dup on the hash prevents this | ||||
| * | Merge pull request #2327 from cesario/patch-1 | José Valim | 2011-07-28 | 1 | -1/+0 |
| |\ | | | | | We don't need to require erb here. | ||||
| | * | We don't need to require erb here. | Franck Verrot | 2011-07-28 | 1 | -1/+0 |
| | | | |||||
| * | | Merge pull request #2330 from thedarkone/resources-router-fix | José Valim | 2011-07-28 | 1 | -8/+7 |
| |\ \ | |/ |/| | Inline resources router fix | ||||
| | * | Make use of the inherited initializer. | thedarkone | 2011-07-28 | 1 | -3/+2 |
| | | | |||||
| | * | There is no need to be destructive with the passed-in options. | thedarkone | 2011-07-28 | 1 | -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 Patterson | 2011-07-26 | 1 | -10/+2 |
| | | | |||||
| * | | use regular ruby rather than clever ruby | Aaron Patterson | 2011-07-26 | 1 | -3/+3 |
| | | | |||||
| * | | fixing wildcard path matching when wildcard is inside parenthesis | Aaron Patterson | 2011-07-26 | 1 | -1/+1 |
| | | | |||||
| * | | Allow a route to have :format => true | Erik Michaels-Ober | 2011-07-25 | 1 | -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 Pastorino | 2011-07-25 | 1 | -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 route | Dave Rogers | 2011-07-25 | 1 | -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. | thedarkone | 2011-07-25 | 1 | -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 Tanata | 2011-07-16 | 1 | -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 removed | Vishnu Atrai | 2011-07-11 | 1 | -0/+1 |
| | | |||||
| * | provide a more explicit message when using url_for with nil | Damien Mathieu | 2011-07-02 | 1 | -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.2 | bagwanpankaj | 2011-06-14 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-11 | 1 | -3/+3 |
| |\ | |||||
| | * | shallow_path example updated | ganesh | 2011-06-10 | 1 | -3/+3 |
| | | | |||||
| * | | removed the unnecessary back slashes from the regular expression | Raghunadh | 2011-06-10 | 1 | -2/+2 |
| | | | |||||
| * | | rafactored the regex related code in the mapper class | Raghunadh | 2011-06-07 | 1 | -4/+7 |
| |/ | |||||
| * | fix creating an empty route on 1.8. Closes #1210 | Damien Mathieu | 2011-06-01 | 1 | -1/+3 |
| | | |||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-25 | 2 | -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 Martinez | 2011-05-23 | 2 | -2/+2 |
| | | | |||||
| | * | Fixed documentation for scope with path. | Anuj Dutta | 2011-05-22 | 1 | -2/+2 |
| | | | |||||
| | * | fixes code highlight in shallow_path example | Diego Plentz | 2011-05-19 | 1 | -4/+4 |
| | | | |||||
| * | | removed deprecated methods, and related tests, from ActionPack | Josh Kalderimis | 2011-05-24 | 1 | -7/+0 |
| | | | |||||
| * | | Correct example and expand on description of :shallow option for resources | Andrew White | 2011-05-21 | 1 | -3/+7 |
| |/ | |||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-14 | 2 | -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 docrails | Xavier Noria | 2011-05-14 | 1 | -2/+2 |
| | | | |||||
| | * | Follow code conventions on docs | Sebastian Martinez | 2011-05-10 | 1 | -4/+4 |
| | | | |||||
| | * | Missing an end in routing docs | James Miller | 2011-05-09 | 1 | -0/+1 |
| | | | |||||
| | * | more fixed-fonts here | Sebastian Martinez | 2011-05-09 | 1 | -23/+23 |
| | | | |||||
| | * | Update the description of the :path option to #resources to reflect that it ↵ | Jacob Poulsgaard Tjoernholm | 2011-05-06 | 1 | -2/+2 |
| | | | | | | | | | sets the actual path, not a prefix. Most instances were already fixed. | ||||
| * | | prepend the assets route instead of appending, closes #436 | José Valim | 2011-05-08 | 1 | -3/+6 |
| |/ | |||||
| * | Use #remove_possible_method instead here | Sebastian Martinez | 2011-05-04 | 1 | -2/+3 |
| | | |||||
| * | raise an error if the old router draw method is used, along with a message ↵ | Josh Kalderimis | 2011-05-03 | 1 | -0/+5 |
| | | | | | advising them to either upgrade their routes or add rails_legacy_mapper to their Gemfile | ||||
| * | Explicitly define main_app proxy | Piotr Sarnacki | 2011-04-25 | 1 | -2/+1 |
| | | |||||
| * | Remove `#among?` from Active Support | Prem Sichanugrist | 2011-04-13 | 1 | -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 Hansson | 2011-04-12 | 1 | -2/+2 |
| | | | | | suggestion! | ||||
| * | Using Object#in? and Object#either? in various places | Prem Sichanugrist | 2011-04-11 | 1 | -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 Sichanugrist | 2011-03-29 | 1 | -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/docrails | Xavier Noria | 2011-03-23 | 1 | -0/+7 |
| |\ | |||||
| | * | doc :anchor option for #match in routes | Gabriel Horner | 2011-03-15 | 1 | -0/+7 |
| | | | |||||
| * | | Do not show optional (.:format) block for wildcard route [#6605 state:resolved] | Prem Sichanugrist | 2011-03-22 | 1 | -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 object | Aaron Patterson | 2011-03-14 | 2 | -11/+13 |
| | | | |||||
| * | | stop splatting arguments so that we can understand wtf is going on | Aaron Patterson | 2011-03-14 | 1 | -2/+3 |
| | | | |||||
| * | | RegexpWithNamedGroups is only used for path_info, so only apply to path info | Aaron Patterson | 2011-03-14 | 1 | -1/+2 |
| |/ | |||||
| * | Just define methods directly on the class rather than use the module | Aaron Patterson | 2011-03-11 | 1 | -14/+5 |
| | | | | | | | indirection. clever-- | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |