aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* assign_nested_attributes_for_collection_association should work with Ruby 1.9...Franck Verrot2011-07-202-1/+6
* Revert "this fixes a brittle test in fixtures_test.rb which fails when you ar...Aaron Patterson2011-07-201-2/+2
* bigdecimal should be typecast to a float on sqlite3. fixes #2162Aaron Patterson2011-07-203-1/+17
* Merge pull request #2159 from ogeidix/masterSantiago Pastorino2011-07-202-1/+8
|\
| * Check Accept and Content-Type headers before evaluating them in xhr requests....ogeidix2011-07-192-1/+8
* | Merge pull request #2165 from joshk/fixtures_test_fixXavier Noria2011-07-201-2/+2
|\ \
| * | this fixes a brittle test in fixtures_test.rb which fails when you are in a t...Josh Kalderimis2011-07-201-2/+2
* | | Merge pull request #2136 from judearasu/guides_branchXavier Noria2011-07-202-4/+6
|\ \ \ | |/ / |/| |
| * | notextile tag has been placed with ascii quotesJudeArasu2011-07-192-4/+6
* | | documents the changes to String#blank? in the AS guideXavier Noria2011-07-201-1/+3
* | | registers the changes to String#blank? in the CHANGELOGXavier Noria2011-07-201-0/+3
* | | Merge pull request #2164 from dmathieu/missing_requireXavier Noria2011-07-201-0/+1
|\ \ \
| * | | missing require of string/encoding to have access to encoding_aware?Damien Mathieu2011-07-201-0/+1
|/ / /
* | | Merge pull request #2146 from dmathieu/blank_binary_encodingXavier Noria2011-07-201-1/+6
|\ \ \
| * | | fix String#blank? on binary strings.Damien Mathieu2011-07-201-1/+6
* | | | Merge pull request #2160 from joshk/patch-5Jeremy Kemper2011-07-191-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Changed the year of a date used in a test which fails when using 1.8.7 on a 3...Josh Kalderimis2011-07-191-1/+1
|/ / /
* | | Merge pull request #2155 from vijaydev/changelogsSantiago Pastorino2011-07-191-0/+2
|\ \ \
| * | | add entry for submit helper change removing object_name_idVijay Dev2011-07-201-0/+2
* | | | Merge pull request #2154 from vijaydev/better_mapSantiago Pastorino2011-07-191-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | avoid Symbol#to_procVijay Dev2011-07-201-1/+1
|/ / /
* | | Merge pull request #2148 from norman/masterSantiago Pastorino2011-07-191-0/+2
|\ \ \ | |/ / |/| |
| * | Explicitly require Active Support dependenciesNorman Clarke2011-07-191-0/+2
|/ /
* | Merge pull request #2139 from mcmire/issue_2078_masterSantiago Pastorino2011-07-182-1/+13
|\ \
| * | ActiveRecord: Fix eager loading so that giving a blank order clause generates...Elliot Winkler2011-07-182-1/+13
| |/
* | Merge pull request #2141 from joshk/masterXavier Noria2011-07-184-9/+159
|\ \ | |/ |/|
| * This fixes an issue when bundling to a local path (eg. /vendor/bundle).Josh Kalderimis2011-07-171-6/+2
| * Added a .travis.yml config and travis specific ci script.Josh Kalderimis2011-07-153-3/+157
* | Merge pull request #2133 from jstorimer/ensure-status-codes-are-logged-properlyJosé Valim2011-07-182-4/+23
|\ \
| * | Ensure that status codes are logged properlyJesse Storimer2011-07-182-4/+23
* | | Merge pull request #2116 from guilleiguaran/fix-environment-generator-actionSantiago Pastorino2011-07-182-2/+10
|\ \ \ | |/ / |/| |
| * | Fix Rails::Generators::Actions#environment when env is passed. Closes #2110Guillermo Iguaran2011-07-182-2/+10
* | | Merge pull request #195 from bigfix/active_model_include_serializationJosé Valim2011-07-188-241/+343
|\ \ \
| * | | ActiveModel support for the :include serialization optionJohn Firebaugh2011-07-176-90/+190
| * | | Move to_xml tests to xml_serialization_test.rbJohn Firebaugh2011-07-172-143/+133
| * | | We already have the record; no need to retrieve it againJohn Firebaugh2011-07-171-2/+2
| * | | Replace map+compact with selectJohn Firebaugh2011-07-171-1/+1
| * | | Add a testJohn Firebaugh2011-07-171-0/+5
| * | | serializable_hash(:only => [], :methods => [:foo]) should workJohn Firebaugh2011-07-172-7/+14
* | | | Merge pull request #2075 from lawrencepit/match_attribute_methodJosé Valim2011-07-181-6/+27
|\ \ \ \
| * | | | Made attribute_method_matchers_cache private + docLawrence Pit2011-07-171-3/+13
| * | | | Issue #2075 Optimization of ActiveModel's match_attribute_method?Lawrence Pit2011-07-161-9/+17
| * | | | Optimization of ActiveModel's match_attribute_method?Lawrence Pit2011-07-151-2/+5
| | |_|/ | |/| |
* | | | Merge pull request #2128 from sikachu/master-dynamic_finderJon Leighton2011-07-184-16/+49
|\ \ \ \
| * | | | Refactor test case to use anonymous class - Thank you @tenderlovePrem Sichanugrist2011-07-181-13/+8
| * | | | Refactor the code a bit to reduce the duplicationPrem Sichanugrist2011-07-171-17/+8
| * | | | Raise an ArgumentError if user passing less number of argument in the dynamic...Prem Sichanugrist2011-07-174-0/+47
* | | | | make tzinfo a development dependencyAaron Patterson2011-07-181-1/+2
* | | | | Merge pull request #2124 from arunagw/render_partial_invalid_check_fixSantiago Pastorino2011-07-171-2/+1
|\ \ \ \ \
| * | | | | Checking with to_s. As regexp fail with 1.8.7Arun Agrawal2011-07-181-2/+1
| |/ / / /