aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #438 from jasonmichaelroth/ordinalize_negative_numbersAaron Patterson2011-05-072-2/+32
|\
| * ordinalize negative numbers patchJason2011-05-072-2/+32
|/
* Merge pull request #435 from vijaydev/masterXavier Noria2011-05-071-5/+10
|\
| * update readme to reflect app/assetsVijay Dev2011-05-071-5/+10
|/
* Merge pull request #434 from arunagw/changelog_docJosé Valim2011-05-071-0/+12
|\
| * Updated change log for jdbc* adapters template.Arun Agrawal2011-05-071-0/+12
* | Class.new.name returns an empty string on 1.8José Valim2011-05-071-1/+1
* | Revert "Revert the merge because tests did not pass."José Valim2011-05-073-5/+44
|/
* Update CHANGELOG.José Valim2011-05-071-0/+2
* Merge pull request #343 from asanghi/ampmJosé Valim2011-05-072-4/+85
|\
| * DRY this baby upAditya Sanghi2011-04-291-23/+4
| * add more documentation; remove unused assignmentAditya Sanghi2011-04-291-4/+14
| * Allow AM/PM in datetime selectorsAditya Sanghi2011-04-292-0/+90
* | Merge pull request #286 from jasoncodes/marshal_subsecJosé Valim2011-05-072-0/+8
|\ \
| * | Fix marshal round-tripping of fractional seconds (Time#subsec).Jason Weathered2011-04-172-0/+8
* | | ADdd missing requires (thanks to @arunagw)José Valim2011-05-072-1/+2
* | | Merge pull request #280 from jballanc/frozen-string-strip-tagsJosé Valim2011-05-072-1/+2
|\ \ \
| * | | Fix for stripping tags from frozen strings.Joshua Ballanco2011-04-141-1/+1
| * | | Test for stripping tags from a frozen string.Joshua Ballanco2011-04-141-0/+1
* | | | Merge pull request #275 from pk-amooma/masterJosé Valim2011-05-072-2/+14
|\ \ \ \
| * | | | test "Escapes special HTML/XML characters" do ...Philipp Kempgen2011-04-261-0/+12
| * | | | for escaping HTML can be treated as normal XMLPhilipp Kempgen (Amooma)2011-04-141-2/+2
| * | | | properly escape "'" to "'" for XML/HTML (BTW Erubis does that as well)Philipp Kempgen (Amooma)2011-04-141-2/+2
* | | | | Merge pull request #263 from CvX/masterJosé Valim2011-05-071-1/+1
|\ \ \ \ \
| * | | | | Corrected dbconsole usage message.2011-04-121-1/+1
* | | | | | Merge remote branch 'rolftimmermans/desc_tracker'José Valim2011-05-077-34/+64
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into desc_trackerRolf Timmermans2011-03-27137-788/+2315
| |\ \ \ \ \ \
| * | | | | | | Revert "Revert "It should be possible to use ActiveSupport::DescendantTracker...Rolf Timmermans2011-03-131-7/+9
| * | | | | | | Refactored AS::DescendantsTracker test cases so they can be tested without AS...Rolf Timmermans2011-03-133-27/+52
| * | | | | | | Missing dependency in MultiByte test.Rolf Timmermans2011-03-131-0/+1
| * | | | | | | Add missing dependency string inflection test.Rolf Timmermans2011-03-131-0/+1
| * | | | | | | Missing dependency for duration test.Rolf Timmermans2011-03-131-0/+1
* | | | | | | | Merge pull request #248 from bigfix/enumerable_as_jsonJosé Valim2011-05-072-10/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | Enumerable should pass encoding options to children in #as_json/#to_json.John Firebaugh2011-04-012-10/+27
* | | | | | | | | Merge pull request #349 from bradley178/masterJosé Valim2011-05-072-3/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix bug with empty CDATA not being handled in Hash.from_xmlBradley Harris2011-04-292-3/+4
| * | | | | | | | | Added test for empty CDATA bug in from_xmlBradley Harris2011-04-291-2/+8
* | | | | | | | | | Use .ref instead of .to_sym.José Valim2011-05-072-2/+4
* | | | | | | | | | adds comments clarifying the role of SharedGeneratorTestsXavier Noria2011-05-073-0/+7
* | | | | | | | | | Merge pull request #424 from gnufied/masterJosé Valim2011-05-062-2/+27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix yield not working from around filter of observers, fixes Github#329Hemant Kumar2011-05-072-2/+27
* | | | | | | | | | | Revert the merge because tests did not pass.José Valim2011-05-063-44/+5
* | | | | | | | | | | Merge pull request #423 from richardiux/masterJosé Valim2011-05-063-5/+44
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Adding base method symbolized_sti_name to activerecord base to be used on ide...Richard Millan2011-05-063-9/+15
| * | | | | | | | | | | Test: identity on inherited classes should behave the same when turned on or offRichard Millan2011-05-051-0/+16
| * | | | | | | | | | | Testing identity map on inherited active record classes. Distinct models tha...Richard Millan2011-05-051-0/+17
* | | | | | | | | | | | Merge pull request #419 from smartinez87/avail_actionJosé Valim2011-05-061-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | better styling on #available_action? docsSebastian Martinez2011-05-061-2/+2
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #418 from myronmarston/am_observer_doc_updatesAaron Patterson2011-05-063-3/+53
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add documentation for new observer enable/disable feature.Myron Marston2011-05-063-3/+53
|/ / / / / / / / / / /