aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@github.com:lifo/docrailsRyan Bigg2008-10-0916-60/+294
|\
| * Fix links in AC guideTore Darell2008-10-078-17/+15
| |
| * Add verification, rescue + fixes to AC basicsTore Darell2008-10-0711-50/+249
| |
| * Additional detail on routes for namespaced controllers.Mike Gunderloy2008-10-071-1/+19
| |
| * Added some additional detail on asset caching syntax.Mike Gunderloy2008-10-071-0/+18
| |
| * Clarify that the event sequence shown in the comments applies to new records ↵Mike Gunderloy2008-10-061-2/+3
| | | | | | | | only.
* | Did some more work on the finders guide tonight, lock and count sections addded.Ryan Bigg2008-10-091-13/+47
|/
* Merge branch 'master' of git@github.com:lifo/docrailsRyan Bigg2008-10-0670-355/+1187
|\
| * Merge commit 'mainstream/master'Pratik Naik2008-10-0566-345/+1142
| |\ | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/association_preload.rb
| | * ActiveResource can load array of strings, like serialize :bar, ArrayMatthew Moore2008-10-052-1/+26
| | | | | | | | | | | | | | | Signed-off-by: rick <technoweenie@gmail.com> [#1055 state:resolved]
| | * Fix a number of errors in the config.gem mechanism.Matt Jones2008-10-0517-49/+410
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rails::GemDependency was missing definitions for hash and eql?, causing Array#uniq to not work. * If several versions of a gem are unpacked in vendor, now chooses the highest if no version is specified. * streamlined add_load_path. Now sets up Rubygems correctly to allow 'gem' to find frozen gems, with gems frozen to vendor/gems and specifications in vendor/gems/<gem-name>/.specification * Rails::GemDependency#specification would return a spec for the highest installed version, even for frozen gems and/or previously loaded lower versions. See in part ticket #1123. * removed vendor from default_load_paths - it was causing autoloading to append Gems::Gems::<gem-dir> to constant names * added additional tests for loading frozen gems. * incorporates the fix from #1107 for vendor rails * defers to freeze:gems for handling the Rails framework. gems:unpack WILL NOT place a copy of Rails in vendor/gems. Should close #1123 completely. * incorporates, via using the gem loader for frozen gems, fixes corresponding to #227, #324, #362, #527, and #742. * gem plugins now work the same whether frozen or not. Correctness of the behavior is a matter for another ticket... Signed-off-by: rick <technoweenie@gmail.com>
| | * Move controller ivar copying to a separate methodPratik Naik2008-10-051-8/+10
| | |
| | * Add tests for ActiveSupport::Rescuable. Use ActiveSupport::Rescuable in ↵Pratik Naik2008-10-045-119/+136
| | | | | | | | | | | | ActionController::Base.
| | * First draft of ActiveSupport::RescuableNorbert Crombach2008-10-041-0/+74
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Ensure Model.sum and Model.avg typecast appropriately. [#1066 state:resolved]Pratik Naik2008-10-042-6/+10
| | | | | | | | | | | | | | | Model.sum delegates typecasting to the column being summed. If that's not feasible, returns a string. Model.avg always returns big decimal.
| | * 1.8 compatibility for random_number method on SecureRandom.Michael Koziarski2008-10-042-2/+6
| | | | | | | | | | | | 1.9 has its own version.
| | * Fix mismatched assertions.Michael Koziarski2008-10-041-2/+2
| | |
| | * Ensure rescue_from handlers are respected inside tests. [#835 state:resolved]Pratik Naik2008-10-043-43/+30
| | | | | | | | | | | | | | | | | | Note : If you're not using rescue_from, you should overrider rescue_action_without_handler() method and not rescue_action(). Afterwards, you can set request.remote_addr to a non "0.0.0.0" value for testing the overridden behavior.
| | * Remove HasManyAssociationStrategy and move the logic to ↵Pratik Naik2008-10-042-27/+21
| | | | | | | | | | | | ActiveRecord::Reflection::ThroughReflection.
| | * Introduce ActiveRecord::Reflection::ThroughReflection to simplify hm:t ↵Pratik Naik2008-10-042-53/+70
| | | | | | | | | | | | reflection logic
| | * Fix has_many :through when the source is a belongs_to association. [#323 ↵Zach Dennis2008-10-046-11/+73
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Try reloading model on class mismatch [#229 state:resolved]Lawrence Pit2008-10-042-1/+21
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Return processing lock to dispatcher, the finer grained lock was ↵Aliaksey Kandratsenka2008-10-042-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | incompatible with the reloading in development mode. This commit also adds ActionController::Dispatcher#dispatch_unlocking -- non-locking version of dispatch. It's named anologously to POSIX {getc,getchar,...}_unlocked functions. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1170 state:committed]
| | * Fix performance bug in AttibuteMethods#respond_to? in handling of private ↵Aliaksey Kandratsenka2008-10-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | methods We have hit dramatic increase in tests time after upgrading rails. Profiling revealed this particular place. After this fix our test times returned back to norm. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1173 state:committed]
| | * call clear_active_connections! in :after_dispatch to give pooled connections ↵Aliaksey Kandratsenka2008-10-042-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | back This fixes connection pool exhaustion for web servers which create new thread per connection (e.g. Webrick). integration.rb changes are required to keep test transaction active for several requests. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1171 state:committed]
| | * made ConnectionPool#checkout more robust by trying to loot dead threads when ↵Aliaksey Kandratsenka2008-10-041-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | pool is empty Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1169 state:committed]
| | * Fix race in ConnectionPool#checkoutAliaksey Kandratsenka2008-10-041-15/+14
| | | | | | | | | | | | | | | | | | | | | After releasing monitor some connection(s) may appear in pool before monitor is re-aquired. When this happens we'll wait for connection which is already available. Signed-off-by: Michael Koziarski <michael@koziarski.com>
| | * don't quote decimal values for mysql. It doesn't make sense and breaks in ↵Aliaksey Kandratsenka2008-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | newer versions of mysql Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1168 state:committed]
| | * Fixed load path for actionmailer and activesupport tests to always load from ↵madlep2008-10-042-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | local lib files. [#983 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| | * Add IMB DB support to Rails application generator. [#1136 state:resolved]Antonio Cangiano2008-10-042-1/+63
| | | | | | | | | | | | | | | | | | Usage : rails app_name -d ibm_db Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Make sure recreate MySQL test database with the proper encoding and ↵Luca Guidi2008-10-033-3/+8
| | | | | | | | | | | | | | | | | | | | | collation [#1165 state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1165 state:committed]
| | * Remove AS for oracle compatibilityMichael Koziarski2008-10-031-1/+1
| | |
| | * added nicer failure reporting to #assert_difference to tell you the ↵madlep2008-10-032-4/+25
| | | | | | | | | | | | | | | | | | | | | expression that failed rather than just the expected and actual values Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1161 state:committed]
| | * Provide alternate implementation of Object#subclasses_of for JRubyNick Sieger2008-10-031-12/+33
| | | | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1144 state:committed]
| | * Dynamic finders should use the ActiveRecord::Base::find method instead of ↵Eloy Duran2008-10-033-13/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ::find_initial, :find_last, and ::find_all. This is so when people override ActiveRecord::Base::find, the new ::find method will also be invoked by the dynamic finders. Associations for instance do go through ::find, so this makes it more consistent. Also removed the unnecessary deprecation silence blocks. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1162 state:committed]
| | * Call controller_path instance method so it can be easily overridden [#1141 ↵David Masover2008-09-301-2/+2
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| | * Fix etag! and last_modified! to work as advertised.Michael Koziarski2008-09-302-3/+44
| | | | | | | | | | | | Add tests too.
| | * Remove unneeded interning.Michael Koziarski2008-09-301-3/+2
| | |
| | * fix eager loading's :condition sanitizing expanding against the wrong tableWill Bryant2008-09-291-5/+5
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| | * wrote a test showing eager loading's misbehavior (sanitizing against the ↵Will Bryant2008-09-291-0/+7
| | | | | | | | | | | | | | | | | | wrong table) when the association has a :conditions hash Signed-off-by: Michael Koziarski <michael@koziarski.com>
| | * Add options to field_set_tagAndrew Kaspick2008-09-292-2/+14
| | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1116 state:committed]
| | * Protect body ivar from being clobbered by the mailer template assignsJoshua Peek2008-09-284-2/+19
| | |
| * | Additional detail on specifying verbs for resource member and collection routes.Mike Gunderloy2008-10-041-2/+15
| | |
| * | Additional detail on options for rendering partials.Mike Gunderloy2008-10-041-1/+27
| | |
| * | Revise associations guide: no need to set default on counter_cache columns.Mike Gunderloy2008-10-041-2/+0
| | |
| * | Remove erroneous warning about counter_cache column defaults.Mike Gunderloy2008-10-041-2/+0
| | |
| * | Fix typography and punctuation in ActiveRecord#find_by_sqlChris Kampmeier2008-10-041-3/+3
| | |
* | | Added a small section on using conditions on tables from eager loads.Ryan Bigg2008-10-061-0/+12
| | |
* | | Updated guide, adding to the conditions section mostly.Ryan Bigg2008-10-051-4/+87
|/ /
* | Finders guide has no table of contents.Ryan Bigg2008-10-011-60/+1
| |