aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | Revert asset tag changesPratik Naik2009-07-251-76/+73
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge commit 'mainstream/master'Pratik Naik2009-07-25146-721/+2932
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | make pass through error code configurable [#2817 state:resolved]John Duff2009-07-224-5/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * | | | | | | | | | | | | | Dasherize XML root by default to avoid invalid tags ↵Joshua Peek2009-07-223-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "<admin/posts>...</admin/posts>" [#2875 state:resolved]
| * | | | | | | | | | | | | | Patch to ActiveModel's (and ActiveRecord, by association) XML serialization: ↵John Maxwell2009-07-224-1/+38
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If two parameters are present in Procs supplied to to_xml's :procs option, the model being serialized will be passed as the second argument [#2373 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * | | | | | | | | | | | | Ruby 1.9.2 compat: name method was renamed to __name__ since MiniTest 1.4.x ↵Akira Matsuda2009-07-211-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 Matsuda2009-07-2110-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 exampleJoshua Peek2009-07-211-15/+8
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | So you can require 'activemodel'Joshua Peek2009-07-211-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | AMo conversion helperJoshua Peek2009-07-2115-55/+53
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Kill AMo BaseJoshua Peek2009-07-213-11/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Improve AMo observing docsJoshua Peek2009-07-211-4/+73
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add wrap_with_notifications helper to AMo observingJoshua Peek2009-07-205-13/+35
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Kill AMo ivar attributes helperJoshua Peek2009-07-207-58/+8
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Vendor the bundler projectYehuda Katz + Carl Lerche2009-07-2019-0/+940
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | First effort at new Ajax helpersYehuda Katz2009-07-203-0/+184
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| | * | | | | | | | | | | | | Add primary_key option to belongs_to associationSzymon Nowak2009-07-1514-16/+159
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#765 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| | * | | | | | | | | | | | ActiveSupport Hash optimizations [#2902 state:resolved]Lourens Naude2009-07-154-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com>
| | * | | | | | | | | | | | 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
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 useYehuda Katz2009-07-195-0/+89
| | | | | | | | | | | | |
| * | | | | | | | | | | | Move default_form_builder to ActionView so it'll work in environments not ↵Yehuda Katz2009-07-192-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using ActionView::Base
| * | | | | | | | | | | | Separate ActionView::Context so something else can easily be made into an AV ↵Yehuda Katz2009-07-196-13/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | context
| * | | | | | | | | | | | 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 ↵Yehuda Katz2009-07-156-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | action_controller.rb
| * | | | | | | | | | | | Rename method to a more obvious nameYehuda Katz2009-07-112-4/+4
| |/ / / / / / / / / / /
| * | | | | | | | | | | 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. ↵Sam Goldstein2009-07-092-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 Pit2009-07-071-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com>
| * | | | | | | | | | Ruby 1.9 style String interpolation support for lower ruby versions. Thanks ↵Lawrence Pit2009-07-073-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-072-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 Tagua2009-07-073-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 Lerche2009-07-066-98/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | first
| * | | | | | | | | | Reapply Rails::Application::Path tweaksYehuda Katz + Carl Lerche2009-07-063-46/+126
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reapplies: a4bdc00fec623f72592e663e6d7830eea0bc6ea4 3c1dab72259d01c6335bf359d7f9b3af69d45bb4
| * | | | | | | | | 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
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | i18n guide: removes some related for 2.2Xavier Noria2009-07-251-37/+2
| | | | | | | | |
* | | | | | | | | i18n guide: minor tweaksXavier Noria2009-07-251-7/+9
| | | | | | | | |
* | | | | | | | | Insert missing word in callbacks documentation.Mike Gunderloy2009-07-191-1/+1
| | | | | | | | |