aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * 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
| * 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
| * 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 ch...José Valim2009-12-0133-36/+38
| * 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
| * | 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 t...Jeremy Kemper2009-11-292-22/+49
| * 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
| * Notifications: extract central Notifier, cordon off the internal Fanout imple...Jeremy Kemper2009-11-286-315/+268
| * Remark that Listener is an implementation detailJeremy Kemper2009-11-281-1/+2
| * Expose a simple Queue#wait to block until all notifications are drainedJeremy Kemper2009-11-282-3/+8
| * Revert "Create SyncListener. Since they do not rely on Thread, they can be us...Jeremy Kemper2009-11-282-74/+35
| * Expand path relative to __FILE__Jeremy Kemper2009-11-281-1/+1
| * avoid generating invalid SMTP commands in ruby pre 1.9Michael Koziarski2009-11-282-1/+35
* | Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-2520-142/+154
|\|
| * Fix the application.rb generatorCarl Lerche2009-11-251-1/+1
| * Fix the rackup test to correctly use Rack::Builder.parse_fileCarl Lerche2009-11-251-1/+2
| * Load application specific rake tasks in the application objectCarl Lerche2009-11-252-5/+2
| * Revert "macruby: no format_datetime or msg2str"Jeremy Kemper2009-11-241-2/+2
| * Have script/* and Rakefile use the application objectCarlhuda2009-11-2415-47/+61
| * Refactor script/dbconsole into an objectCarlhuda2009-11-242-80/+90
| * Use Rails.env after loading environmentJeremy Kemper2009-11-241-2/+2
| * Quieter rake test runnerJoshua Peek2009-11-242-10/+0
* | Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-2414-255/+177
|\|