aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/rails/railsDmitry Polushkin2011-12-31795-28340/+35803
|\
| * Merge pull request #4237 from castlerock/fiber_available_in_ruby19Aaron Patterson2011-12-301-1/+1
| |\
| | * fiber is available in ruby19Vishnu Atrai2011-12-311-1/+1
| * | updating the reaping frequency documentationAaron Patterson2011-12-301-0/+3
| * | rename start to run and use Thread.pass rather than sleeping to schedule the ...Aaron Patterson2011-12-302-23/+31
| * | connection pool starts the reaperAaron Patterson2011-12-302-0/+17
| * | just dup the spec now that it will deep copyAaron Patterson2011-12-301-2/+1
| * | connection specification will deep copy the configAaron Patterson2011-12-302-0/+16
| * | each connection pool has a reaperAaron Patterson2011-12-303-2/+18
| * | introduce a timer class for reaping connectionsAaron Patterson2011-12-302-0/+65
| * | raise a pull full error when the connection pool is full and no connection ca...Aaron Patterson2011-12-302-18/+28
| * | connections are only removed if they are inactveAaron Patterson2011-12-302-3/+19
| * | connections can be reaped via the `reap` methodAaron Patterson2011-12-302-0/+27
| * | deal with removing connections associated with the current threadAaron Patterson2011-12-302-0/+15
| * | connections can be removed from the poolAaron Patterson2011-12-302-1/+28
| * | queue and signal no longer neededAaron Patterson2011-12-301-2/+0
| * | refactor checking out the connectionAaron Patterson2011-12-301-5/+6
| * | infinite loop is no longer necessaryAaron Patterson2011-12-301-20/+11
| * | connections must be checked in at the end of a threadAaron Patterson2011-12-303-31/+7
| |/
| * Merge pull request #4235 from castlerock/remove_ruby_18_BasicObjectJosé Valim2011-12-301-1/+0
| |\
| | * ruby 1.8 ActiveSupport BasicObject no longer availableVishnu Atrai2011-12-301-1/+0
| * | Merge pull request #4236 from castlerock/to_time_available_in_ruby19_DateTimeJosé Valim2011-12-301-1/+1
| |\ \ | | |/ | |/|
| | * remove condition since to_time always available in ruby19 DateTimeVishnu Atrai2011-12-311-1/+1
| |/
| * be explicit about where helpers are installedAaron Patterson2011-12-302-2/+2
| * Merge pull request #4224 from alexeymuranov/my-fix-for-fixture-tablesAaron Patterson2011-12-308-25/+109
| |\
| | * Fixes for TestFixtures::setup_fixture_accessorsAlexey Muranov2011-12-301-6/+5
| | * Fixture's table name be defined in the modelAlexey Muranov2011-12-301-10/+17
| | * Test case: fixture table name is defined in modelAlexey Muranov2011-12-301-0/+5
| | * Use foo/bar instead of foo_bar keys for fixturesAlexey Muranov2011-12-301-12/+25
| | * Test fixtures with custom model and table namesAlexey Muranov2011-12-307-0/+60
| * | Merge pull request #4233 from bogdan/remove_define_runnerJosé Valim2011-12-301-16/+3
| |\ \
| | * | AS::Callbacks: remove __define_runnerBogdan Gusiev2011-12-301-16/+3
| | |/
| * | adds a comments that clarifies why Range#include? chooses the comparison oper...Xavier Noria2011-12-301-0/+1
| * | Merge pull request #4229 from lest/range-includeXavier Noria2011-12-302-1/+6
| |\ \ | | |/ | |/|
| | * refactor Range#include? to handle ranges with floatsSergey Nartimov2011-12-292-1/+6
| * | just add the writer rather than adding both and removing oneAaron Patterson2011-12-291-2/+1
| * | stop using __send__ and just module eval in the extensionsAaron Patterson2011-12-291-3/+2
| * | we know the classes will be a list, so *tell* it to respond to eachAaron Patterson2011-12-291-3/+3
| * | don't need the begin / endAaron Patterson2011-12-291-21/+17
| * | avoid extra method calls by just defining the delegateAaron Patterson2011-12-291-2/+3
| * | Merge pull request #4226 from grentis/content_for_with_flushJosé Valim2011-12-292-8/+84
| |\ \
| | * | content_for with flush parametergrentis2011-12-292-8/+84
| |/ /
| * | don't use instance eval, just reference variables so we don't have toAaron Patterson2011-12-291-10/+11
| * | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-12-295-22/+17
| |\ \
| | * | revise some doc changesVijay Dev2011-12-291-9/+4
| | * | Documented about using :path option for resourcesKevin Moore2011-12-281-0/+7
| | * | Fixed formatting of code examples in form_tag_helper.rbAlejandro Andrés2011-12-281-4/+4
| | * | typoJo Liss2011-12-281-1/+1
| | * | Document that index names are made up of all columns, not just the first.Jo Liss2011-12-271-9/+2
| | * | Remove unnecessary comma.Uģis Ozols2011-12-261-1/+1