aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)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 ruby19 condition removed
| | * 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
| | | | | | | | | | | | watchdog
| * | 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 ↵Aaron Patterson2011-12-302-18/+28
| | | | | | | | | | | | can be obtained
| * | 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 available
| | * 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 DateTime
| | * 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
| |\ | | | | | | Fix #2572 and define fixture table name in the associated model
| | * Fixes for TestFixtures::setup_fixture_accessorsAlexey Muranov2011-12-301-6/+5
| | | | | | | | | | | | | | | | | | Renamed "fixture_name" to "accessor_name" and made fixture names in the form "admin/users" be used as the key for the hashes @fixture_cache and @loaded_fixtures. Previously the variable "fixture_name" here was getting a value of the form "admin_user", and this value was then used as the hash key.
| | * Fixture's table name be defined in the modelAlexey Muranov2011-12-301-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | Made the fixture's table name be taken from its model class whenever this class responds to table_name, instead of inferring it sometimes from the fixture's pass. The previous behavior seemed buggy because it depended on whether the model class was passed as a constant or as a name string. Improved Fixtures#initialize.
| | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This solves an issue with set_fixture_class class method caused by create_fixtures method's overwriting passed to it fixture model classes, when the fixtures are "namespased": foo/bar or admin/users. The idea is to use "foo/bar" string as the name and identifier of a fixture file bar in directory foo. The model class of the fixture is either set with set_fixture_class method, or otherwise inferred from its name using camelize method. Also a bug is fixed in lines 487-489 when the table names were guessed by substitution from the fixture file names, ambiguously called table_names, instead of being taken from fixture attributes. Now they are taken from attributes. I plan to submit another fix so that the fixture's table name (for example foo_bar) be defined by the fixture's model whenever possible, instead of inferring it from the fixture's name ("foo/bar").
| | * Test fixtures with custom model and table namesAlexey Muranov2011-12-307-0/+60
| | | | | | | | | | | | | | | | | | Test using fixtures with random names and model names, that is not following naming conventions but using set_fixture_class instead. It is expected that the table name be defined in the model, but this is not explicitly tested here. This will need to be fixed.
| * | Merge pull request #4233 from bogdan/remove_define_runnerJosé Valim2011-12-301-16/+3
| |\ \ | | | | | | | | AS::Callbacks: remove __define_runner
| | * | AS::Callbacks: remove __define_runnerBogdan Gusiev2011-12-301-16/+3
| | |/
| * | adds a comments that clarifies why Range#include? chooses the comparison ↵Xavier Noria2011-12-301-0/+1
| | | | | | | | | | | | operator
| * | Merge pull request #4229 from lest/range-includeXavier Noria2011-12-302-1/+6
| |\ \ | | |/ | |/| refactor Range#include? to handle ranges with floats
| | * 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
| | | | | | | | | | | | rather than casting
| * | 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 parameter
| | * | 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
| | | | | | | | | | | | worry about "inspect" marshalling
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | index_name has been using the following expression "index_#{table_name}_on_#{Array.wrap(options[:column]) * '_and_'}" since at least 2006 (bc7f2315), and that's how they come out in my DB. Please check that this is correct before merging into master, perhaps I'm misunderstanding the section I changed.
| | * | Remove unnecessary comma.Uģis Ozols2011-12-261-1/+1
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 03:08:24 +0000