aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix failing railties tests.José Valim2010-07-211-0/+3
|
* Add .rdoc extension to README files.José Valim2010-07-212-1/+1
|
* Rework a bit README files.José Valim2010-07-211-9/+0
|
* Remove old install.rb files.José Valim2010-07-212-43/+4
|
* No need to delegate. Simply include the whole RecordIdentifier module.José Valim2010-07-217-25/+10
|
* Moved a few methods from RecordIdentifier to ActiveModel::NamingPiotr Sarnacki2010-07-214-78/+9
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Moved PolymorphicRoutes to ActionDispatch::RoutingPiotr Sarnacki2010-07-208-189/+191
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Add a test for elapsed and require missing benchmark file.José Valim2010-07-201-0/+1
|
* Add missing require to metal/streaming.rbJosé Valim2010-07-201-0/+2
|
* Extract ParameterFilter class from FilterParameters mixinBryan Helmkamp2010-07-194-68/+86
| | | | Signed-off-by: wycats <wycats@gmail.com>
* Remove assert_valid. It was already deprecated on Rails 2.3.José Valim2010-07-193-36/+0
|
* Remove unused orig_handler and unneeded parenthesesSantiago Pastorino2010-07-201-3/+3
|
* Add missing entries and tidy up CHANGELOG.José Valim2010-07-191-0/+2
|
* There is absolutely no need to use __send__ here.José Valim2010-07-191-3/+3
|
* No need to create a new module in the previous commit.José Valim2010-07-194-18/+10
|
* Exceptions from views should be rescued based on the original exception. If ↵Neeraj Singh2010-07-194-2/+46
| | | | | | | | a handler for original exception is missing then apply ActiveView::TemplateError [#2034 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Set session options id to nil is respected and cancels lazy loading.José Valim2010-07-182-3/+21
|
* select :include_blank or :prompt should return escaped string [#5099 ↵Ivan Torres2010-07-182-3/+26
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* fixing the ternary operation where the logic is very confusing.Neeraj Singh2010-07-181-1/+2
| | | | | | [#5136 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Avoid uneeded queries in session stores if sid is not given.José Valim2010-07-182-3/+5
|
* Removing ActionDispatch::Http::FilterParameters#fitered_parameters aliasNick Quaranto2010-07-181-2/+1
|
* Merge remote branch 'docrails/master'Xavier Noria2010-07-171-7/+7
|\
| * Small fix in cookie docs and trailing whitespacesCarlos Antonio da Silva2010-07-151-7/+7
| |
* | Bump up nokogiri, memcache-client, sqlite3-ruby, fcgi, mail and tzinfoSantiago Pastorino2010-07-151-1/+1
| |
* | Bump up to rack-mount 0.6.9 and rack-mount-0.6.6.pre removed from ↵Santiago Pastorino2010-07-1536-4015/+2
|/ | | | action_dispatch vendor
* Merge remote branch 'docrails/master'Xavier Noria2010-07-135-18/+18
|\
| * Fixed many references to the old config/environment.rb and Rails::InitializerBenjamin Quorning2010-07-133-16/+16
| |
| * Removed deprecated |map| block argument from routing docs since it is no ↵Steven Hancock2010-07-112-2/+2
| | | | | | | | | | | | longer generated in edge Rails config/routes.rb Didn't touch plugins guide since I'm not too clear on how routes work in plugins.
* | remove size attribute from tag generated by file_field helper [#5084 ↵Miles Egan2010-07-132-1/+6
| | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Fixes a regression caused by having mapping options controller and action as ↵Santiago Pastorino2010-07-121-1/+4
| | | | | | | | | | | | blank Signed-off-by: José Valim <jose.valim@gmail.com>
* | Routes should respect namespace even if action is a regexp and just ↵José Valim2010-07-122-37/+44
|/ | | | controller is given to to.
* Merge remote branch 'docrails/master'Xavier Noria2010-07-091-6/+4
|\
| * API Docs: Fixes to the Routing docsRohit Arondekar2010-07-071-6/+4
| |
* | Fix setting helpers_path to a string or pathnameJeremy Kemper2010-07-073-6/+7
|/
* Merge remote branch 'docrails/master'Xavier Noria2010-07-071-1/+11
|\
| * Added documentation for usage of associative resources with form_forRizwan Reza2010-07-011-1/+11
| |
* | When a dynamic :controller segment is present in the path add a Regexp ↵Andrew White2010-07-073-21/+46
| | | | | | | | | | | | | | | | | | | | | | constraint that allow matching on multiple path segments. Using a namespace block isn't compatible with dynamic routes so we raise an ArgumentError if we detect a :module present in the scope. [#5052 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Refactor handling of :only and :except options. The rules are:Andrew White2010-07-062-73/+236
| | | | | | | | | | | | | | | | | | | | | | 1. Don't inherit when specified as an option on a resource 2. Don't push into scope when specified as an option on a resource 2. Resources pull in :only or :except options from scope 3. Either :only or :except in nested scope overwrites parent scope [#5048 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Recognize should also work with route is wrapped in a constraint.José Valim2010-07-063-1/+8
| |
* | RouteSet should also handle anonymous classes.José Valim2010-07-051-2/+2
| |
* | Define a convention for descendants and subclasses.José Valim2010-07-053-9/+2
| | | | | | | | | | | | The former should be symmetric with ancestors and include all children. However, it should not include self since ancestors + descendants should not have duplicated. The latter is symmetric to superclass in the sense it only includes direct children. By adopting a convention, we expect to have less conflict with other frameworks, as Datamapper. For this moment, to ensure ActiveModel::Validations can be used with Datamapper, we should always call ActiveSupport::DescendantsTracker.descendants(self) internally instead of self.descendants avoiding conflicts.
* | Adds tests for content negotiation change introduced in dc5300adb6d46252c26ePatrik Stenmark2010-07-041-0/+20
| | | | | | | | Signed-off-by: wycats <wycats@gmail.com>
* | Fix syntax of routing tests so they actually runAndrew White2010-07-041-12/+18
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Refactor resource options and scoping. Resource classes are now only ↵Andrew White2010-07-042-101/+145
| | | | | | | | | | | | responsible for controlling how they are named. All other options passed to resources are pushed out to the scope. Signed-off-by: José Valim <jose.valim@gmail.com>
* | Fixes for "router" and "routes" terminologyWincent Colaiuta2010-07-036-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit f7ba614c2db improved the internal consistency of the different means of accessing routes, but it introduced some problems at the level of code comments and user-visible strings. This commit applies fixes on three levels: Firstly, we remove or replace grammatically invalid constructs such as "a routes" or "a particular routes". Secondly, we make sure that we always use "the router DSL" or "the router syntax", because this has always been the official terminology. Finally, we make sure that we only use "routes" when referring to the application-specific set of routes that are defined in the "config/routes.rb" file, we use "router" when referring on a more abstract level to "the code in Rails used to handle routing", and we use "routing" when we need an adjective to apply to nouns such as "url_helpers. Again this is consistent with historical practice and other places in the documentation. Note that this is not a sweep over the entire codebase to ensure consistent usage of language; it is just a revision of the changes introduced in commit f7ba614c2db. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: José Valim <jose.valim@gmail.com>
* | Refactor recall parameter normalization [#5021 state:resolved]Andrew White2010-07-032-18/+33
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Fix routes with :controller segment when namespaced [#5034 state:resolved]José Valim2010-07-024-30/+63
| |
* | bump erubis version to 2.6.6 and thor version to 0.13.7Santiago Pastorino2010-07-021-1/+1
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Unify routes naming by renaming router to routesPiotr Sarnacki2010-07-0214-35/+35
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | porting session.clear fix to master branch. [#5030 state:resolved]Aaron Patterson2010-07-012-0/+27
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>