aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-0277-295/+439
|\
| * Use to_query in route query string generationJoshua Peek2009-12-021-24/+1
| |
| * Quick fix for not escaping []s (not ideal)Joshua Peek2009-12-021-1/+1
| |
| * Failing tests for to_param/to_query not escaping "[]"Joshua Peek2009-12-023-6/+6
| |
| * Fix instance_eval calls to association proxiesMat Brown2009-12-022-6/+10
| | | | | | | | | | | | | | | | In the current stable, ActiveRecord::Associations::AssociationProxy#method_missing calls yield() if a block is given, causing the block to always be evaluated in its calling context. However, in the case of instance_eval, correct behavior requires that the block be passed directly to the @target, rather than being evaluated inside a different block. Incidentally, this also simplifies the code slightly. [#3412 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Implement ActiveRecord#reset_counter_cacheMike Breen2009-12-023-0/+30
| | | | | | | | | | | | [#1211 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Merge branch 'master' of github.com:rails/railsJoshua Peek2009-12-0216-116/+123
| |\
| | * Ignore all pkg filesCarlhuda2009-12-021-7/+1
| | |
| | * Fix an ivar name conflict in Rails::ServerCarlhuda2009-12-021-5/+5
| | |
| | * Stop evalling the environment file in favor of require + setting a ↵Carlhuda2009-12-021-18/+17
| | | | | | | | | | | | Kernel#config. This will fix the bug where reopening classes caused them to be overwritten.
| | * Add support for bare ActiveSupport via config.active_support.bareCarlhuda2009-12-024-16/+18
| | |
| | * Break up rails and railties:Carlhuda2009-12-026-13/+49
| | | | | | | | | | | | | | | | | | | | | * rails is now a metagem (gem install rails works as it does now) * railties includes the glue layer, so you can easily declare dependencies on railties, actionpack, and actionmailer and not get ActiveRecord's rake tasks, initializers, etc.
| | * Remove global Rails initializersCarlhuda2009-12-027-59/+35
| | |
| * | Move controller namespace tracking into route set so it getsJoshua Peek2009-12-025-46/+37
| |/ | | | | | | reloaded in dev mode
| * Stop escaping "[]" in query stringJoshua Peek2009-12-022-6/+4
| |
| * Rackmount 0.3.0Joshua Peek2009-12-021-1/+1
| |
| * Fork rack build nested query to support to_paramJoshua Peek2009-12-021-2/+43
| |
| * Ensure Cache-Control max-age is an integerJeremy Kemper2009-12-022-2/+2
| |
| * Response#write is defined twice (this is why -w is good)Joshua Peek2009-12-011-6/+0
| |
| * Response#cache_control is defined laterJoshua Peek2009-12-011-1/+0
| |
| * Remove concat before overriding itJoshua Peek2009-12-011-6/+7
| |
| * Fix parens warning in ajax testJoshua Peek2009-12-011-6/+6
| |
| * cache_store and page_cache_directory are already defined in cachingJoshua Peek2009-12-011-4/+1
| | | | | | | | and pages
| * Silence known internal AM deprecation callsJoshua Peek2009-12-011-3/+7
| |
| * Fix @renderer warningJoshua Peek2009-12-011-10/+10
| |
| * Simply track controller namespaces instead of a complete list ofJoshua Peek2009-12-012-47/+22
| | | | | | | | possible controllers to route to
| * Make recognize try to constantize controller to see if it existsJoshua Peek2009-12-013-3/+15
| |
| * Some basic route discovery testsJoshua Peek2009-12-011-0/+85
| |
| * Update vendored thor and ensure that content is completely modified before ↵José Valim2009-12-0133-36/+38
| | | | | | | | | | | | checking file collisions. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Avoid using unrequired core extensionsJeremy Kemper2009-12-011-1/+1
| |
| * rails:update:configs updates boot.rb and the rest of config/*Jeremy Kemper2009-12-011-0/+1
| |
| * Reinstate rails:update:configs task removed in e1fdc8bJeremy Kemper2009-12-011-0/+5
| |
| * Fix rails:update:scriptsJeremy Kemper2009-12-011-1/+1
| |
| * Merge branch 'master' of github.com:rails/railsJoshua Peek2009-12-013-3/+26
| |\
| | * Fix caching test to ensure notifications are all deliveredJeremy Kemper2009-12-011-0/+1
| | |
| | * Allow ActionController::Responder to have a common entry point for all formats.José Valim2009-12-012-3/+25
| | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
| * | Fix generating params with optional defaults [#3404 state:resolved]Joshua Peek2009-12-012-4/+2
| |/
* | Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-0117-476/+545
|\|
| * Define a welcome controller in mailer testsJoshua Peek2009-11-291-22/+22
| |
| * Fix some nested resource generation testsJoshua Peek2009-11-292-11/+12
| |
| * Wrap up http related routing helpersJoshua Peek2009-11-291-33/+37
| |
| * Break down long match routing methodJoshua Peek2009-11-291-23/+53
| |
| * Make use of extract_options!Joshua Peek2009-11-291-6/+6
| |
| * Extract Resource and SingletonResource helper objectsJoshua Peek2009-11-291-28/+84
| |
| * Bump required rack-mount version to 0.2.3Joshua Peek2009-11-291-1/+1
| |
| * Remove rackmount submoduleJoshua Peek2009-11-292-3/+0
| |
| * Resource collection should be defined before member routesJoshua Peek2009-11-291-6/+6
| |
| * Notifications: synchronous fanout queue pushes events to subscribers rather ↵Jeremy Kemper2009-11-292-22/+49
| | | | | | | | than having them concurrently pull
| * Update reference to deprecated constant to avoid warningsBryan Helmkamp2009-11-281-1/+1
| |
| * Remove reference to class that doesn't exist (ht: brynary)Yehuda Katz2009-11-281-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-16 00:48:42 +0000