Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Introduced ActiveRecord::Relation, a layer between an ARel relation and an ↵ | Emilio Tagua | 2009-07-21 | 8 | -54/+77 |
| | | | | AR relation | ||||
* | Merge commit 'rails/master' | Emilio Tagua | 2009-07-21 | 63 | -167/+1319 |
|\ | |||||
| * | Ruby 1.9.2 compat: name method was renamed to __name__ since MiniTest 1.4.x ↵ | Akira Matsuda | 2009-07-21 | 1 | -1/+2 |
| | | | | | | | | | | | | [#2922 state:resolved] Signed-off-by: Yehuda Katz <wycats@gmail.com> | ||||
| * | Ruby 1.9.2 compat: Use File#expand_path for require path because "." will ↵ | Akira Matsuda | 2009-07-21 | 10 | -11/+11 |
| | | | | | | | | | | | | not be included in LOAD_PATH since Ruby 1.9.2 [#2921 state:resolved] Signed-off-by: Yehuda Katz <wycats@gmail.com> | ||||
| * | Clean up validation example | Joshua Peek | 2009-07-21 | 1 | -15/+8 |
| | | |||||
| * | So you can require 'activemodel' | Joshua Peek | 2009-07-21 | 1 | -0/+1 |
| | | |||||
| * | AMo conversion helper | Joshua Peek | 2009-07-21 | 15 | -55/+53 |
| | | |||||
| * | Kill AMo Base | Joshua Peek | 2009-07-21 | 3 | -11/+5 |
| | | |||||
| * | Improve AMo observing docs | Joshua Peek | 2009-07-21 | 1 | -4/+73 |
| | | |||||
| * | Add wrap_with_notifications helper to AMo observing | Joshua Peek | 2009-07-20 | 5 | -13/+35 |
| | | |||||
| * | Kill AMo ivar attributes helper | Joshua Peek | 2009-07-20 | 7 | -58/+8 |
| | | |||||
| * | Vendor the bundler project | Yehuda Katz + Carl Lerche | 2009-07-20 | 19 | -0/+940 |
| | | |||||
| * | First effort at new Ajax helpers | Yehuda Katz | 2009-07-20 | 3 | -0/+184 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-20 | 47 | -176/+401 |
|\| | |||||
| * | Merge branch 'master' of git@github.com:rails/rails | Yehuda Katz | 2009-07-19 | 21 | -101/+268 |
| |\ | |||||
| | * | * don't include String#% for Ruby 1.9 | Sven Fuchs | 2009-07-18 | 2 | -78/+87 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * raise a KeyError exception for missing named interpolation args (like Ruby 1.9 does) * raise an ArgumentError when mixing named and unnamed placeholders (like Ruby 1.9 does) * improve docs and comply a bit more w/ Rails names/conventions [#2870 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | | Rename ActiveRecordHelper to ActiveModelHelper | Yehuda Katz | 2009-07-20 | 5 | -7/+5 |
| | | | |||||
| * | | Finish convert_to_object updates | Yehuda Katz | 2009-07-20 | 2 | -1/+9 |
| | | | |||||
| * | | Update some tests and add a to_model to form helpers | Yehuda Katz | 2009-07-20 | 7 | -11/+19 |
| | | | |||||
| * | | Define ActiveModel API Compliance | Yehuda Katz | 2009-07-20 | 17 | -32/+91 |
| | | | | | | | | | | | | | | | | | | - Define to_model on AR - Define to_model on ActiveModel::APICompliant - Update test fixtures to be API Compliant - Start using to_model in AP | ||||
| * | | Add some simple examples for unconventional AMo and AP use | Yehuda Katz | 2009-07-19 | 5 | -0/+89 |
| | | | |||||
| * | | Move default_form_builder to ActionView so it'll work in environments not ↵ | Yehuda Katz | 2009-07-19 | 2 | -6/+18 |
| | | | | | | | | | | | | using ActionView::Base | ||||
| * | | Separate ActionView::Context so something else can easily be made into an AV ↵ | Yehuda Katz | 2009-07-19 | 6 | -13/+49 |
| | | | | | | | | | | | | context | ||||
| * | | Simplify required "ActionView compliant" API | Yehuda Katz | 2009-07-19 | 5 | -22/+17 |
| | | | |||||
| * | | Add some missing dependencies | Yehuda Katz | 2009-07-15 | 3 | -0/+4 |
| | | | |||||
| * | | Fix AbstractController::Layouts to work when included directly on a controller | Yehuda Katz | 2009-07-15 | 1 | -0/+1 |
| | | | |||||
| * | | Centralize commonly used parts of AS in ActionController into ↵ | Yehuda Katz | 2009-07-15 | 6 | -9/+15 |
| | | | | | | | | | | | | action_controller.rb | ||||
| * | | Rename method to a more obvious name | Yehuda Katz | 2009-07-11 | 2 | -4/+4 |
| | | | |||||
* | | | Performance boost for AR#create | Emilio Tagua | 2009-07-20 | 1 | -3/+4 |
| | | | |||||
* | | | Removed legacy test. | Emilio Tagua | 2009-07-20 | 1 | -19/+0 |
| | | | |||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-16 | 18 | -20/+167 |
|\ \ \ | | |/ | |/| | |||||
| * | | Add primary_key option to belongs_to association | Szymon Nowak | 2009-07-15 | 14 | -16/+159 |
| | | | | | | | | | | | | | | | | | | [#765 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | | ActiveSupport Hash optimizations [#2902 state:resolved] | Lourens Naude | 2009-07-15 | 4 | -4/+8 |
| | | | | | | | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com> | ||||
* | | | Added ActiveRecord::Base#(where|join|project|group|order|take|skip) methods. | Emilio Tagua | 2009-07-16 | 2 | -40/+59 |
| | | | |||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-14 | 32 | -395/+705 |
|\| | | |||||
| * | | Use map! instead of map for <association>_ids | Pratik Naik | 2009-07-13 | 1 | -2/+2 |
| | | | |||||
| * | | Optimize <association>_ids for hm:t with belongs_to source | Pratik Naik | 2009-07-13 | 2 | -3/+14 |
| |/ | |||||
| * | Add observing hooks to ARes | Joshua Peek | 2009-07-11 | 2 | -2/+62 |
| | | |||||
| * | Integrate AMo XML serializer into AR | Joshua Peek | 2009-07-11 | 2 | -131/+31 |
| | | |||||
| * | Switch scaffolding templates to HTML 5 doctype | Joshua Peek | 2009-07-10 | 6 | -89/+80 |
| | | |||||
| * | Make it so AR attributes which conflict with object-private methods (e.g. ↵ | Sam Goldstein | 2009-07-09 | 2 | -4/+25 |
| | | | | | | | | | | | | | | | | | | system) don't 'randomly' cause NoMethodErrors Previously if you called this attribute before others, you'd get exceptions. But if it was the second-or-subsequent attribute you retrieved you'd get the correct behaviour. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2808 state:committed] | ||||
| * | Use the i18n gem if present instead of vendor code. [#2871 state:resolved] | Lawrence Pit | 2009-07-07 | 1 | -5/+4 |
| | | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com> | ||||
| * | Ruby 1.9 style String interpolation support for lower ruby versions. Thanks ↵ | Lawrence Pit | 2009-07-07 | 3 | -0/+150 |
| | | | | | | | | | | | | to code from Masao Mutoh's GetText gem. [#2870 state:resolved] Signed-off-by: Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local> | ||||
| * | Add support for dumping non-standard primary keys when using the SQLite3 ↵ | Hongli Lai (Phusion) | 2009-07-07 | 2 | -8/+12 |
| | | | | | | | | | | | | adapter. Fix unit tests so that this feature is tested for all adapters. [#2868 state:resolved] Signed-off-by: Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local> | ||||
| * | Adds a audio_tag helper for the HTML5 audio tag. Fixed video_path docs. HTML ↵ | Emilio Tagua | 2009-07-07 | 3 | -9/+72 |
| | | | | | | | | | | | | attributes values should be true or false not attribute's name. [#2864 state:resolved] Signed-off-by: Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local> | ||||
| * | Get Initializer tests running without requiring parts of Rails being loaded ↵ | Yehuda Katz + Carl Lerche | 2009-07-06 | 6 | -98/+129 |
| | | | | | | | | first | ||||
| * | Reapply Rails::Application::Path tweaks | Yehuda Katz + Carl Lerche | 2009-07-06 | 3 | -46/+126 |
| | | | | | | | | | | Reapplies: a4bdc00fec623f72592e663e6d7830eea0bc6ea4 3c1dab72259d01c6335bf359d7f9b3af69d45bb4 | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-06 | 11 | -162/+451 |
|\| | |||||
| * | Integrate AMo JSON serializer into AR | Joshua Peek | 2009-07-03 | 6 | -172/+134 |
| | | |||||
| * | Initial extraction of AMo xml serializer | Joshua Peek | 2009-07-03 | 7 | -20/+346 |
| | |