aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* benchmarker and profiler now use the new performance testing tools (support ↵Gonçalo Silva2011-05-104-95/+82
| | | | for Rubinius and JRuby and high configurability)
* fixed a typo in the guideGonçalo Silva2011-05-091-2/+2
|
* contemplate unsupported metricsGonçalo Silva2011-05-093-30/+18
|
* added a note about profiling options to the generatorsGonçalo Silva2011-05-092-2/+8
|
* explicitly return from run() under minitest (metrics were printed with the ↵Gonçalo Silva2011-05-082-1/+3
| | | | previous solution)
* Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-05-08371-22008/+7586
|\ | | | | | | | | Conflicts: activesupport/lib/active_support/testing/performance.rb
| * Merge pull request #449 from msgehard/rename_duplicate_test_methodsSantiago Pastorino2011-05-072-2/+2
| |\ | | | | | | Rename duplicate tests
| | * Rename duplicate tests. There is now one failing test that was failing ↵Mike Gehard2011-05-072-2/+2
| |/ | | | | | | before the rename but was never getting run.
| * Merge pull request #442 from jasonnoble/namespace_fixturesAaron Patterson2011-05-078-318/+323
| |\ | | | | | | Namespace Fixtures in ActiveRecord
| | * Added deprecation warning for Fixture(s) (Use ActiveRecord::Fixture(s))Jason Noble2011-05-071-0/+3
| | |
| | * Namespace Fixtures in ActiveRecordJason Noble2011-05-078-318/+320
| | | | | | | | | [Fixes #439]
| * | Revert "Merge pull request #275 from pk-amooma/master"José Valim2011-05-072-14/+2
| | | | | | | | | | | | | | | | | | | | | Several AP tests fail after this change. This reverts commit aaf01cd53718c8aa5b69ac056b997e6dd9893777, reversing changes made to 9cc18c52faeebaad6a76bd62cdca1c6b9f96afed.
| * | Always expand */*José Valim2011-05-072-8/+5
| | |
| * | Fixes ticket #6379. Improved the handling of Accept headers containing */*.mathieuravaux2011-05-072-4/+12
| | | | | | | | | | | | | | | | | | | | | `lookup_context#formats=` being too restrictive, "Accept: text/javascript, */*" resulted in [:js, "*/*"] formats instead of [:js, :html]. Signed-off-by: José Valim <jose.valim@gmail.com>
| * | xml_mini_test.rb now runs.José Valim2011-05-072-8/+1
| | |
| * | Merge pull request #438 from jasonmichaelroth/ordinalize_negative_numbersAaron Patterson2011-05-072-2/+32
| |\| | | | | | | ordinalize negative numbers patch
| | * ordinalize negative numbers patchJason2011-05-072-2/+32
| |/ | | | | | | | | | | | | Applied patch by Amir Manji https://github.com/rails/rails/issues/437#issuecomment-1116045 Signed-off-by: Jason <jasonmichaelroth@gmail.com>
| * Merge pull request #435 from vijaydev/masterXavier Noria2011-05-071-5/+10
| |\ | | | | | | Update README template to include info about app/assets
| | * 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 changelog for jdbc* adapters template.
| | * 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
| |/ | | | | | | This reverts commit 886818d2bab40585c0cea763002ffc16917dd0b3.
| * Update CHANGELOG.José Valim2011-05-071-0/+2
| |
| * Merge pull request #343 from asanghi/ampmJosé Valim2011-05-072-4/+85
| |\ | | | | | | Allow AM/PM format in datetime selectors
| | * 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).
| | * | 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
| |\ \ \ | | | | | | | | | | Stripping tags from a frozen string
| | * | | Fix for stripping tags from frozen strings.Joshua Ballanco2011-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | This returns behavior under Ruby 1.9 to match Ruby 1.8.
| | * | | Test for stripping tags from a frozen string.Joshua Ballanco2011-04-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test will pass under Ruby 1.8 but fail under Ruby 1.9 because of the change in behavior of gsub! w.r.t. frozen strings that do not match the pattern used [ruby-core:23664].
| * | | | Merge pull request #275 from pk-amooma/masterJosé Valim2011-05-072-2/+14
| |\ \ \ \ | | | | | | | | | | | | properly escape "'" to "'" for XML
| | * | | | 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 "&apos;" 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
| | * | | | | 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 ↵Rolf Timmermans2011-03-131-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveSupport::DescendantTracker without getting ActiveSupport::Dependencies for free."" This reverts commit 9f5b1e1ed08df9dbedded0a6b7798d919d43b9a6. Tests have been refactored so they pass in isolation.
| | * | | | | | | Refactored AS::DescendantsTracker test cases so they can be tested without ↵Rolf Timmermans2011-03-133-27/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AS::Dependencies.
| | * | | | | | | 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
| | * | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Hash.from_xml chokes on empty CDATA
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 14:35:24 +0000