aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-0852-185/+381
|\ | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb
| * Test cache.key_file_path with separators ht. Jim Wilson [#5611]Santiago Pastorino2010-11-071-0/+5
| |
| * Fix FileStore cache incorrectly regenerating its key from a pathname when a ↵Denis Odorcic2010-11-072-4/+7
| | | | | | | | | | | | | | | | regexp is used in expire_fragment [#5850 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Update the validates_uniqueness_of documentation to tell you to use a unique ↵Michael Koziarski2010-11-081-25/+17
| | | | | | | | | | | | index. The other options mentioned were not good ideas and disclaimed as such in the documentation.
| * Make safe_append= live on AV::OutputBuffer not AS::SafeBufferMichael Koziarski2010-11-082-1/+1
| | | | | | | | | | | | Conflicts: actionpack/lib/action_view/template/handlers/erb.rb
| * Added support for Erubis <%== tagJan Maurits Faber2010-11-083-1/+16
| | | | | | | | | | | | | | <%== x %> is syntactic sugar for <%= raw(x) %> Signed-off-by: Michael Koziarski <michael@koziarski.com> [#5918 status:committed]
| * OrderedHash#select now preserves order [#5843 state:resolved]James A. Rosen2010-11-072-0/+10
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Make cookies hash in ActionDispatch::TestProcess indifferent access [#5761 ↵David Trasbo2010-11-072-1/+19
| | | | | | | | | | | | state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Ensure that HashWithIndifferentAccess duplication preserves class (for ↵laserlemon2010-11-072-3/+18
| | | | | | | | | | | | sublclasses) and default value [#5724 state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * use column names as order by complex function parameters, fix for postgresql ↵Raimonds Simanovskis2010-11-072-13/+3
| | | | | | | | | | | | adapter to correctly remove ASC/DESC Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * reduce duplication in assiciations #construct()Aaron Patterson2010-11-061-9/+3
| |
| * Move @assigns from the controller to the test itselfSantiago Pastorino2010-11-062-1/+1
| |
| * Fix problems trying to functional test AC::Metal controllersSantiago Pastorino2010-11-063-11/+10
| | | | | | | | [#5393 state:committed]
| * make sure we keep parent records in orderAaron Patterson2010-11-061-6/+6
| |
| * only call to_s on the association variable onceAaron Patterson2010-11-051-2/+5
| |
| * simplify instantiate in the join parts objectAaron Patterson2010-11-051-8/+7
| |
| * index is not used, so removing itAaron Patterson2010-11-051-1/+1
| |
| * reduce method calls to the join base objectAaron Patterson2010-11-051-4/+6
| |
| * Correctly handle the case of an API response that returns a hash by treating ↵Chris Eppstein2010-11-062-1/+17
| | | | | | | | a single hash argument as the resource instead of as options.
| * stop recursively calling exists?Aaron Patterson2010-11-051-3/+5
| |
| * Bring back ruby-debug19 for Ruby versions < 1.9.3Santiago Pastorino2010-11-051-0/+5
| |
| * Avoid warning: shadowing outer local variableSantiago Pastorino2010-11-051-2/+2
| |
| * Fixes queries using limits and punctuation in order, removes order("col1, ↵Santiago Pastorino2010-11-055-8/+29
| | | | | | | | | | | | col2") usage in favor of order(["col1", "col2"}) [#4597 state:committed]
| * renaming exec in the mysql adapterAaron Patterson2010-11-052-15/+15
| |
| * renaming exec in the PG adapterAaron Patterson2010-11-053-14/+14
| |
| * converted exec to exec_query for sqliteAaron Patterson2010-11-054-27/+27
| |
| * Association Proxy should not undefine the default respond_to_missingsblackstone2010-11-041-1/+1
| |
| * Update to latest thor.José Valim2010-11-041-1/+1
| |
| * ignoring certain SQL when using OracleAaron Patterson2010-11-031-0/+4
| |
| * select goes through exec(), so no method chaining for query countsAaron Patterson2010-11-031-12/+0
| |
| * use bind params in select with query monkeypatchAaron Patterson2010-11-031-2/+2
| |
| * Just initialize options with an empty hashSantiago Pastorino2010-11-031-2/+1
| |
| * add more tests surrounding camlize in xmlmini, refactor rename_key()Aaron Patterson2010-11-032-6/+14
| |
| * Allowing to_xml :camelize option to be set to :lower to enable ↵Jeremy Holland2010-11-034-4/+24
| | | | | | | | lower-camelcase tags [#5903 state:resolved]
| * made a pass to the docs of :negative_formatXavier Noria2010-11-031-5/+7
| |
| * Added :negative_format option to number_to_currency function [#5894 ↵Don Wilson2010-11-023-8/+24
| | | | | | | | | | | | state:resolved] Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
| * Test that capture doesn't escape twiceSantiago Pastorino2010-11-021-2/+7
| |
| * Call as ERB::Util.html_escape since is not the module is not included hereSantiago Pastorino2010-11-021-1/+1
| |
| * Make sure capture's output gets html_escaped [#5545 state:resolved]Jeff Kreeftmeijer2010-11-023-7/+8
| | | | | | | | | | | | | | Also remove a duplicate test_link_to_unless assertion and add .html_safe to the remaining one. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Add additional HTTP request methods from the following RFCs:Andrew White2010-11-023-4/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Hypertext Transfer Protocol -- HTTP/1.1 http://www.ietf.org/rfc/rfc2616.txt) * HTTP Extensions for Distributed Authoring -- WEBDAV http://www.ietf.org/rfc/rfc2518.txt * Versioning Extensions to WebDAV http://www.ietf.org/rfc/rfc3253.txt * Ordered Collections Protocol (WebDAV) http://www.ietf.org/rfc/rfc3648.txt * Web Distributed Authoring and Versioning (WebDAV) Access Control Protocol http://www.ietf.org/rfc/rfc3744.txt * Web Distributed Authoring and Versioning (WebDAV) SEARCH http://www.ietf.org/rfc/rfc5323.txt * PATCH Method for HTTP http://www.ietf.org/rfc/rfc5789.txt [#2809 state:resolved] [#5895 state:resolved]
| * Make should_record_timestamps? serialization aware rather than object#changed?Pratik Naik2010-11-022-5/+1
| |
| * Ensure save always updates timestamps when serialized attributes are presentPratik Naik2010-11-022-0/+18
| |
| * Add timestamps to TopicPratik Naik2010-11-023-6/+7
| |
* | Update new tests in cascaded_eager_loading_test.rb to work with the modified ↵Jon Leighton2010-10-311-6/+6
| | | | | | | | fixtures in this branch
* | Fix bug with 0bb85ed9ffa9808926b46e8f7e59cab5b85ac19f which missed out a ↵Jon Leighton2010-10-311-1/+2
| | | | | | | | fixtures declaration in cascaded_eager_loading_test.rb
* | Fix naughty trailing whitespaceJon Leighton2010-10-3121-259/+259
| |
* | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-3116-43/+121
|\| | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/has_many_association.rb activerecord/lib/active_record/associations/through_association_scope.rb
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-10-304-5/+7
| |\
| | * reverting last change to javascript helper; needs more investigationAditya Sanghi2010-10-291-1/+1
| | |
| | * fixed javascript helper doc to close issue #10 raised by jialinAditya Sanghi2010-10-291-1/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 00:56:55 +0000