aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Ensure that status codes are logged properlyJesse Storimer2011-07-182-4/+23
* 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
| |/ / /
* / / / Don't do remove_possible_method when delegate is used. Two reasons: 1) warnin...Jon Leighton2011-07-182-5/+2
|/ / /
* | | Merge pull request #2046 from sikachu/master-test_fixSantiago Pastorino2011-07-171-2/+6
|\ \ \
| * | | Fix a wrong assertion on url_helper_test, and refactor `html_safe` test to be...Prem Sichanugrist2011-07-171-2/+6
| | |/ | |/|
* | | Merge pull request #2018 from bhus/render_partial_invalid_checkSantiago Pastorino2011-07-173-0/+16
|\ \ \
| * | | Added view template invalid name check, along with tests. No merges in commit.huskins2011-07-133-0/+16
* | | | Revert "Fix failure in test_preserves_existing_fixture_data from test/cases/f...Jon Leighton2011-07-171-2/+2
| |/ / |/| |
* | | Merge pull request #2118 from arunagw/fix_plugin_gen_testSantiago Pastorino2011-07-171-1/+1
|\ \ \
| * | | As we are adding db folder in it. Required in test also.Arun Agrawal2011-07-171-1/+1
|/ / /
* | | indeed, if we are going to remove everything in public/assets on assets:clean...Xavier Noria2011-07-171-4/+1
* | | if we are cleaning all files, we are cleaning all gz filesXavier Noria2011-07-171-1/+0
* | | Merge pull request #2082 from htanata/rake_routes_formattingSantiago Pastorino2011-07-164-15/+107
|\ \ \
| * | | Improve formatting of route to Rack application in rake routes.Hendy Tanata2011-07-172-3/+24
| * | | Better formatting of route requirements in rake:routes.Hendy Tanata2011-07-164-14/+85
| | |/ | |/|
* | | Merge pull request #2108 from loz/masterSantiago Pastorino2011-07-161-0/+5
|\ \ \
| * | | Added gem helper to rake task for engines, as per pull request from 3-1-stabl...Jonathan Lozinski2011-07-161-0/+5
* | | | Fix the output a bitSantiago Pastorino2011-07-161-2/+2
* | | | Merge pull request #2101 from loz/masterJosé Valim2011-07-161-1/+1
|\| | |
| * | | Added db to gemspec files so migrations are correctly packagedJonathan Lozinski2011-07-161-1/+1
| |/ /
* | | Merge pull request #2090 from htanata/fix_wildcard_route_code_in_changelogSantiago Pastorino2011-07-151-2/+2
|\ \ \ | |/ / |/| |
| * | Fix wildcard route code example in changelog.Hendy Tanata2011-07-161-2/+2
|/ /
* | Merge pull request #2073 from bfolkens/masterSantiago Pastorino2011-07-141-0/+5
|\ \
| * | assert nothing raised for setting a cookie value to nil in ActionDispatchBradford Folkens2011-07-141-0/+5
* | | Merge pull request #2063 from elight/masterSantiago Pastorino2011-07-142-3/+29
|\ \ \
| * | | Fix and unit test for https://github.com/rails/rails/issues/2059Evan Light2011-07-142-3/+29
* | | | Merge pull request #1807 from caius/find_in_batches_id_bugSantiago Pastorino2011-07-142-2/+21
|\ \ \ \ | |_|/ / |/| | |
| * | | Stop find_in_batches using the records after yielding.Caius Durling2011-06-212-2/+21
* | | | Merge pull request #2066 from amatsuda/magicomeAaron Patterson2011-07-142-0/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | need magic commentsAkira Matsuda2011-07-142-0/+4
|/ / /
* | | Merge pull request #2052 from amatsuda/fullwidth_blankAaron Patterson2011-07-132-2/+6
|\ \ \
| * | | treat fullwidth whitespace as a blank characterAkira Matsuda2011-07-142-2/+6
| | |/ | |/|
* / | Bump rack upSantiago Pastorino2011-07-131-1/+1
|/ /