aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-07-2047-176/+401
|\
| * Merge branch 'master' of git@github.com:rails/railsYehuda Katz2009-07-1921-101/+268
| |\
| | * * don't include String#% for Ruby 1.9Sven Fuchs2009-07-182-78/+87
| * | Rename ActiveRecordHelper to ActiveModelHelperYehuda Katz2009-07-205-7/+5
| * | Finish convert_to_object updatesYehuda Katz2009-07-202-1/+9
| * | Update some tests and add a to_model to form helpersYehuda Katz2009-07-207-11/+19
| * | Define ActiveModel API ComplianceYehuda Katz2009-07-2017-32/+91
| * | Add some simple examples for unconventional AMo and AP useYehuda Katz2009-07-195-0/+89
| * | Move default_form_builder to ActionView so it'll work in environments not usi...Yehuda Katz2009-07-192-6/+18
| * | Separate ActionView::Context so something else can easily be made into an AV ...Yehuda Katz2009-07-196-13/+49
| * | Simplify required "ActionView compliant" APIYehuda Katz2009-07-195-22/+17
| * | Add some missing dependenciesYehuda Katz2009-07-153-0/+4
| * | Fix AbstractController::Layouts to work when included directly on a controllerYehuda Katz2009-07-151-0/+1
| * | Centralize commonly used parts of AS in ActionController into action_controll...Yehuda Katz2009-07-156-9/+15
| * | Rename method to a more obvious nameYehuda Katz2009-07-112-4/+4
* | | Performance boost for AR#createEmilio Tagua2009-07-201-3/+4
* | | Removed legacy test.Emilio Tagua2009-07-201-19/+0
* | | Merge commit 'rails/master'Emilio Tagua2009-07-1618-20/+167
|\ \ \ | | |/ | |/|
| * | Add primary_key option to belongs_to associationSzymon Nowak2009-07-1514-16/+159
| * | ActiveSupport Hash optimizations [#2902 state:resolved]Lourens Naude2009-07-154-4/+8
* | | Added ActiveRecord::Base#(where|join|project|group|order|take|skip) methods.Emilio Tagua2009-07-162-40/+59
* | | Merge commit 'rails/master'Emilio Tagua2009-07-1432-395/+705
|\| |
| * | Use map! instead of map for <association>_idsPratik Naik2009-07-131-2/+2
| * | Optimize <association>_ids for hm:t with belongs_to sourcePratik Naik2009-07-132-3/+14
| |/
| * Add observing hooks to AResJoshua Peek2009-07-112-2/+62
| * Integrate AMo XML serializer into ARJoshua Peek2009-07-112-131/+31
| * Switch scaffolding templates to HTML 5 doctypeJoshua Peek2009-07-106-89/+80
| * Make it so AR attributes which conflict with object-private methods (e.g. sys...Sam Goldstein2009-07-092-4/+25
| * Use the i18n gem if present instead of vendor code. [#2871 state:resolved]Lawrence Pit2009-07-071-5/+4
| * Ruby 1.9 style String interpolation support for lower ruby versions. Thanks t...Lawrence Pit2009-07-073-0/+150
| * Add support for dumping non-standard primary keys when using the SQLite3 adap...Hongli Lai (Phusion)2009-07-072-8/+12
| * Adds a audio_tag helper for the HTML5 audio tag. Fixed video_path docs. HTML ...Emilio Tagua2009-07-073-9/+72
| * Get Initializer tests running without requiring parts of Rails being loaded f...Yehuda Katz + Carl Lerche2009-07-066-98/+129
| * Reapply Rails::Application::Path tweaksYehuda Katz + Carl Lerche2009-07-063-46/+126
* | Merge commit 'rails/master'Emilio Tagua2009-07-0611-162/+451
|\|
| * Integrate AMo JSON serializer into ARJoshua Peek2009-07-036-172/+134
| * Initial extraction of AMo xml serializerJoshua Peek2009-07-037-20/+346
| * Ensure JSON serializer includes model naming Joshua Peek2009-07-032-1/+2
* | Merge commit 'rails/master'Emilio Tagua2009-07-0316-35/+345
|\|
| * Revert "Compact the way application paths are defined"Pratik Naik2009-07-031-13/+27
| * Revert "Modify the Rails::Application::Path object to allow for more concise ...Pratik Naik2009-07-032-113/+19
| * Added tests for the :install_gem_spec_stubs initializerYehuda Katz + Carl Lerche2009-07-027-25/+115
| * Wrote tests for the :check_ruby_version initializerYehuda Katz + Carl Lerche2009-07-021-0/+59
| * Adds support for def self.setup in isolation tests for setup that should be r...Yehuda Katz + Carl Lerche2009-07-023-7/+26
| * Compact the way application paths are definedYehuda Katz + Carl Lerche2009-07-021-27/+13
| * Modify the Rails::Application::Path object to allow for more concise path def...Yehuda Katz + Carl Lerche2009-07-022-19/+113
| * Allow symbols on routes declaration (:controller and :action values) [#2828 s...Jesús García Sáez2009-07-022-0/+11
| * Removed unnecessary calls to image_path and hash lookups [#2827 state:resolved]Yehuda Katz + Carl Lerche2009-07-021-3/+3
| * Fixed ActiveSupport::OrderedHash::[] work identically to ::Hash::[] in ruby 1...Brian Abreu2009-07-022-5/+42
| * My suggestion to fix ticket 2401 [#2401 state:resolved]Jarl Friis2009-07-022-4/+98