aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Remove whitespaces from the default mailer filePratik Naik2009-07-301-2/+1
|
* Fix tag helpers so that all HTML element boolean attributes render according ↵Marc Love2009-07-303-6/+9
| | | | | | to the specs. Added all boolean attributes listed in the XHTML 1.0 specs (http://www.w3.org/TR/xhtml1/guidelines.html) and HTML 5 specs (http://www.whatwg.org/specs/web-apps/current-work). HTML 5 boolean attribute rendering was broken in commit 1e2d7229602f467cfdc0ef606b5ef8a5566a1501 / [#2864 state:resolved]. Signed-off-by: Yehuda Katz <wycats@gmail.com>
* Revert "Methods invoked within named scope Procs should respect the scope ↵Jeremy Kemper2009-07-293-12/+1
| | | | | | | | | | stack. [#1267 state:resolved]" This reverts commit 6a13376525f34a00e013fc3a6022838329dfe856. Conflicts: activerecord/test/cases/named_scope_test.rb
* Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-07-2916-90/+535
|\
| * Remove last TODO.José Valim2009-07-294-8/+3
| | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com>
| * Add a couple more tests to respond_with.José Valim2009-07-292-11/+46
| | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com>
| * Added respond_with.José Valim2009-07-293-27/+209
| | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com>
| * Added tests for respond_to class method.José Valim2009-07-296-3/+73
| | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com>
| * Ensure that the proper accept header value is set during tests.José Valim2009-07-292-30/+30
| | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com>
| * Improve request test coverage by adding formats and negotiate_mime tests.José Valim2009-07-291-0/+39
| | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com>
| * Remove Mime::ALL from Mime::SET.José Valim2009-07-292-2/+5
| | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com>
| * Refactor even more Responder. Move mime negotiation to request and added ↵José Valim2009-07-293-69/+145
| | | | | | | | | | | | respond_to class method. Signed-off-by: Yehuda Katz <wycats@gmail.com>
| * Refactor Responder to only calculate available mime types. Those are sent to ↵José Valim2009-07-292-61/+74
| | | | | | | | | | | | the controller that knows what to do with it (render a block or call default render). Signed-off-by: Yehuda Katz <wycats@gmail.com>
| * Add support for error_messages_for(@obj)Yehuda Katz2009-07-284-9/+41
| |
* | Always use application generator to run templates.José Valim2009-07-282-2/+1
| |
* | Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-07-2876-615/+1861
|\|
| * Ignore everything under test/fixtures/public/absolutePratik Naik2009-07-271-1/+1
| |
| * Merge docrailsPratik Naik2009-07-2566-607/+1765
| |
| * 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>
* | Ensure that not namespaced generators also load RAILS_ROOT/lib/templates files.José Valim2009-07-281-0/+5
| |
* | Ensure that developers options are overwritten by user options.José Valim2009-07-282-17/+35
| |
* | Allow templates for non namespaced generators too.José Valim2009-07-251-1/+5
| |
* | Updated vendored thor to 0.11.3.José Valim2009-07-2336-116/+92
| |
* | Do not try to use thor gem.José Valim2009-07-232-10/+1
| |
* | Solving merge conflicts.José Valim2009-07-21106-278/+1798
|\|
| * 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>
| * | 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
| | |