Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'rails/master' | Emilio Tagua | 2009-08-05 | 31 | -254/+706 |
|\ | |||||
| * | Allow validations to use values from custom readers [#2936 state:resolved] | James Hill | 2009-08-05 | 5 | -4/+71 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Make sure javascript_include_tag/stylesheet_link_tag does not append ".js" ↵ | Matthew Rudy Jacobs | 2009-08-05 | 3 | -12/+22 |
| | | | | | | | | | | | | or ".css" onto external urls [#1664 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Revert "fallback_string_to_date sets Date._parse comp arg to true, so that ↵ | Geoff Buesing | 2009-08-05 | 3 | -9/+1 |
| | | | | | | | | | | | | strings with two-digit years, e.g. '1/1/09', are interpreted as modern years" [#2019 state:wontfix] This reverts commit 55d1d12c32a1b99f3f07d2346b49a63650ba2e9d. | ||||
| * | Extract generic attribute method generation to AMo | Joshua Peek | 2009-08-04 | 9 | -299/+284 |
| | | |||||
| * | whitespace | Joshua Peek | 2009-08-04 | 1 | -5/+5 |
| | | |||||
| * | Added reset_attribute! method to ActiveRecord::AttributeMethods::Dirty which ↵ | Paul Gillard | 2009-08-04 | 2 | -12/+39 |
| | | | | | | | | | | | | will reset an attribute to its original value should it have changed. Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Modified ActiveRecord::AttributeMethods to allow classes to specify ↵ | Paul Gillard | 2009-08-04 | 5 | -56/+200 |
| | | | | | | | | | | | | attribute method prefixes and/or suffixes. Previously only suffixes were allowed. Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Add simple support for ActiveModel's StateMachine for ActiveRecord | Joshua Peek | 2009-08-04 | 9 | -29/+122 |
| | | |||||
| * | fallback_string_to_date sets Date._parse comp arg to true, so that strings ↵ | Matt Ganderup | 2009-08-03 | 3 | -1/+9 |
| | | | | | | | | with two-digit years, e.g. '1/1/09', are interpreted as modern years [#2019 state:resolved] | ||||
| * | quoted_date converts time-like objects to ↵ | Geoff Buesing | 2009-08-03 | 4 | -1/+127 |
| | | | | | | | | ActiveRecord::Base.default_timezone before serialization. This allows you to use Time.now in find conditions and have it correctly be serialized as the current time in UTC when default_timezone == :utc [#2946 state:resolved] | ||||
* | | Added collection iteration to AR::Relation. | Emilio Tagua | 2009-08-03 | 2 | -1/+4 |
| | | |||||
* | | Don't use local vars before testing its conditional. | Emilio Tagua | 2009-08-03 | 2 | -8/+6 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-03 | 19 | -117/+92 |
|\| | |||||
| * | Track generated attribute methods in a separate module | Joshua Peek | 2009-08-02 | 4 | -35/+19 |
| | | |||||
| * | Remove legacy processing and content_length | Yehuda Katz | 2009-08-02 | 4 | -49/+12 |
| | | | | | | | | | | | | | | | | | | | | | | * convert_content_type! is handled by assign_default_content_type_and_charset! * set_content_length! should be handled by the endpoint server. Otherwise each middleware that modifies the body has to do the expensive work of recalculating content_length. * convert_language! appears to be legacy. There are no tests for this * convert_cookies! should be handled by the new HeaderHash in Rack * Use an integer for .status's internal representation to avoid needing to do String manipulation just to find out the status | ||||
| * | Update cache_control to be a Hash of options that is used to build the header. | Yehuda Katz | 2009-08-02 | 7 | -30/+29 |
| | | | | | | | | * Significantly simplifies setting and modifying cache control in other areas | ||||
| * | Ruby 1.9: fix encoding for test_file_stream | Jeremy Kemper | 2009-08-01 | 1 | -1/+2 |
| | | |||||
| * | Ruby 1.9: fix Content-Length for multibyte send_data streaming | Sava Chankov | 2009-08-01 | 3 | -1/+17 |
| | | | | | | | | | | | | [#2661 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Extract String#bytesize shim | Jeremy Kemper | 2009-08-01 | 3 | -3/+14 |
| | | |||||
| * | SQLite: drop support for 'dbfile' option in favor of 'database.' | Jeremy Kemper | 2009-08-01 | 2 | -1/+2 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-31 | 410 | -5713/+11767 |
|\| | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb | ||||
| * | Start separating primary key concerns | Joshua Peek | 2009-07-30 | 4 | -65/+76 |
| | | |||||
| * | Make sure we use send for the default attribute method body because the ↵ | Joshua Peek | 2009-07-30 | 1 | -1/+1 |
| | | | | | | | | suffix maybe an invalid method name | ||||
| * | Make sure to reset defined methods after calling attribute_method_suffix | Joshua Peek | 2009-07-30 | 1 | -9/+7 |
| | | |||||
| * | Move attribute_types_cached_by_default into attribute methods reading concern | Joshua Peek | 2009-07-30 | 2 | -10/+11 |
| | | |||||
| * | Don't need to pass attr_name to evaluate_attribute_method anymore | Joshua Peek | 2009-07-30 | 4 | -9/+9 |
| | | |||||
| * | Undefine id and let it automatically be generated | Joshua Peek | 2009-07-30 | 4 | -24/+6 |
| | | |||||
| * | Redirect method missing for primary key to read_attribute | Joshua Peek | 2009-07-30 | 2 | -5/+3 |
| | | |||||
| * | ditto for id= | Joshua Peek | 2009-07-30 | 2 | -8/+4 |
| | | |||||
| * | Don't define id_before_type_cast, just let it be generated on its own | Joshua Peek | 2009-07-30 | 2 | -6/+6 |
| | | |||||
| * | Move id attribute methods into their related concern | Joshua Peek | 2009-07-30 | 4 | -29/+28 |
| | | |||||
| * | Restore DangerousAttributeError | Joshua Peek | 2009-07-30 | 3 | -3/+27 |
| | | |||||
| * | Wrap up attribute method reset concerns in 'undefine_attribute_methods' | Joshua Peek | 2009-07-30 | 2 | -2/+7 |
| | | |||||
| * | read_attribute is always available through attribute | Joshua Peek | 2009-07-30 | 1 | -7/+1 |
| | | |||||
| * | cache_attributes is related to attribute reading | Joshua Peek | 2009-07-30 | 2 | -19/+19 |
| | | |||||
| * | Generate methods for all suffixes | Joshua Peek | 2009-07-30 | 4 | -32/+12 |
| | | |||||
| * | Concernify AR AttributeMethods | Joshua Peek | 2009-07-30 | 10 | -383/+451 |
| | | |||||
| * | Removed default_internal, which was preventing round-tripping of some encodings. | Yehuda Katz | 2009-07-30 | 1 | -1/+0 |
| | | |||||
| * | Generator config should be commented by default | Pratik Naik | 2009-07-30 | 1 | -5/+5 |
| | | |||||
| * | Remove whitespaces from the default mailer file | Pratik Naik | 2009-07-30 | 1 | -2/+1 |
| | | |||||
| * | Fix tag helpers so that all HTML element boolean attributes render according ↵ | Marc Love | 2009-07-30 | 3 | -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 Kemper | 2009-07-29 | 3 | -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/rails | José Valim | 2009-07-29 | 16 | -90/+535 |
| |\ | |||||
| | * | Remove last TODO. | José Valim | 2009-07-29 | 4 | -8/+3 |
| | | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com> | ||||
| | * | Add a couple more tests to respond_with. | José Valim | 2009-07-29 | 2 | -11/+46 |
| | | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com> | ||||
| | * | Added respond_with. | José Valim | 2009-07-29 | 3 | -27/+209 |
| | | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com> | ||||
| | * | Added tests for respond_to class method. | José Valim | 2009-07-29 | 6 | -3/+73 |
| | | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com> | ||||
| | * | Ensure that the proper accept header value is set during tests. | José Valim | 2009-07-29 | 2 | -30/+30 |
| | | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com> | ||||
| | * | Improve request test coverage by adding formats and negotiate_mime tests. | José Valim | 2009-07-29 | 1 | -0/+39 |
| | | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com> |