aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-08-0531-254/+706
|\
| * Allow validations to use values from custom readers [#2936 state:resolved]James Hill2009-08-055-4/+71
| * Make sure javascript_include_tag/stylesheet_link_tag does not append ".js" or...Matthew Rudy Jacobs2009-08-053-12/+22
| * Revert "fallback_string_to_date sets Date._parse comp arg to true, so that st...Geoff Buesing2009-08-053-9/+1
| * Extract generic attribute method generation to AMoJoshua Peek2009-08-049-299/+284
| * whitespaceJoshua Peek2009-08-041-5/+5
| * Added reset_attribute! method to ActiveRecord::AttributeMethods::Dirty which ...Paul Gillard2009-08-042-12/+39
| * Modified ActiveRecord::AttributeMethods to allow classes to specify attribute...Paul Gillard2009-08-045-56/+200
| * Add simple support for ActiveModel's StateMachine for ActiveRecordJoshua Peek2009-08-049-29/+122
| * fallback_string_to_date sets Date._parse comp arg to true, so that strings wi...Matt Ganderup2009-08-033-1/+9
| * quoted_date converts time-like objects to ActiveRecord::Base.default_timezone...Geoff Buesing2009-08-034-1/+127
* | Added collection iteration to AR::Relation.Emilio Tagua2009-08-032-1/+4
* | Don't use local vars before testing its conditional.Emilio Tagua2009-08-032-8/+6
* | Merge commit 'rails/master'Emilio Tagua2009-08-0319-117/+92
|\|
| * Track generated attribute methods in a separate moduleJoshua Peek2009-08-024-35/+19
| * Remove legacy processing and content_lengthYehuda Katz2009-08-024-49/+12
| * Update cache_control to be a Hash of options that is used to build the header.Yehuda Katz2009-08-027-30/+29
| * Ruby 1.9: fix encoding for test_file_streamJeremy Kemper2009-08-011-1/+2
| * Ruby 1.9: fix Content-Length for multibyte send_data streamingSava Chankov2009-08-013-1/+17
| * Extract String#bytesize shimJeremy Kemper2009-08-013-3/+14
| * SQLite: drop support for 'dbfile' option in favor of 'database.'Jeremy Kemper2009-08-012-1/+2
* | Merge commit 'rails/master'Emilio Tagua2009-07-31410-5713/+11767
|\|
| * Start separating primary key concernsJoshua Peek2009-07-304-65/+76
| * Make sure we use send for the default attribute method body because the suffi...Joshua Peek2009-07-301-1/+1
| * Make sure to reset defined methods after calling attribute_method_suffixJoshua Peek2009-07-301-9/+7
| * Move attribute_types_cached_by_default into attribute methods reading concernJoshua Peek2009-07-302-10/+11
| * Don't need to pass attr_name to evaluate_attribute_method anymoreJoshua Peek2009-07-304-9/+9
| * Undefine id and let it automatically be generatedJoshua Peek2009-07-304-24/+6
| * Redirect method missing for primary key to read_attributeJoshua Peek2009-07-302-5/+3
| * ditto for id=Joshua Peek2009-07-302-8/+4
| * Don't define id_before_type_cast, just let it be generated on its ownJoshua Peek2009-07-302-6/+6
| * Move id attribute methods into their related concernJoshua Peek2009-07-304-29/+28
| * Restore DangerousAttributeErrorJoshua Peek2009-07-303-3/+27
| * Wrap up attribute method reset concerns in 'undefine_attribute_methods'Joshua Peek2009-07-302-2/+7
| * read_attribute is always available through attributeJoshua Peek2009-07-301-7/+1
| * cache_attributes is related to attribute readingJoshua Peek2009-07-302-19/+19
| * Generate methods for all suffixesJoshua Peek2009-07-304-32/+12
| * Concernify AR AttributeMethodsJoshua Peek2009-07-3010-383/+451
| * Removed default_internal, which was preventing round-tripping of some encodings.Yehuda Katz2009-07-301-1/+0
| * Generator config should be commented by defaultPratik Naik2009-07-301-5/+5
| * 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
| * Revert "Methods invoked within named scope Procs should respect the scope sta...Jeremy Kemper2009-07-293-12/+1
| * Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-07-2916-90/+535
| |\
| | * Remove last TODO.José Valim2009-07-294-8/+3
| | * Add a couple more tests to respond_with.José Valim2009-07-292-11/+46
| | * Added respond_with.José Valim2009-07-293-27/+209
| | * Added tests for respond_to class method.José Valim2009-07-296-3/+73
| | * Ensure that the proper accept header value is set during tests.José Valim2009-07-292-30/+30
| | * Improve request test coverage by adding formats and negotiate_mime tests.José Valim2009-07-291-0/+39