aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Use MiniTest in Ruby 1.8 if it is available."Carlos Antonio da Silva2012-11-132-8/+1
| | | | | | | This reverts commit c3e186ec8dcb2ec26d5d56f3e89123b1350c4a6f. Reason: too many incompatibilities make a lot of Rails tests fail in 1.9. Might need more work to get this done properly in 3-2 if necessary.
* Add changelog entry for #8200 [ci skip]Carlos Antonio da Silva2012-11-131-0/+7
|
* Update mocha version to 0.13.0 and change requiresCarlos Antonio da Silva2012-11-133-3/+2
|
* Fix json encoding test with ruby 1.8.7 and random hash orderCarlos Antonio da Silva2012-11-131-1/+2
| | | | Introduced in 3e53fe6.
* Merge pull request #8200 from freerange/3-2-stable-with-mocha-fixesCarlos Antonio da Silva2012-11-133-5/+11
|\ | | | | Fix 3-2-stable to work with Mocha v0.13.0
| * Avoid a Mocha deprecation warning.James Mead2012-11-131-1/+1
| |
| * Fix for Test::Unit Mocha compatibility.James Mead2012-11-131-3/+5
| | | | | | | | | | | | | | | | Mocha is now using a single AssertionCounter which needs a reference to the testcase as opposed to the result. This change is an unfortunate consequence of the copying of a chunk of Mocha's internal code in order to monkey-patch Test::Unit.
| * Use MiniTest in Ruby 1.8 if it is available.James Mead2012-11-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveSupport::TestCase was always inheriting from Test::Unit::TestCase. This works fine in Ruby 1.9 where Test::Unit::TestCase is a thin wrapper around MiniTest::Unit::TestCase, but does not work in Ruby 1.8 if the MiniTest gem is used. What happens is that ActiveSupport inherits from the Test::Unit::TestCase provided by the standard library, but then since Minitest is defined, it then seems to proceed on the assumption that ActiveSupport::TestCase has MiniTest::Unit::TestCase in its ancestor chain. However, in this case it does not. The fix is simply to choose which test library TestCase to inherit from using the same logic used elsewhere to detect MiniTest. I noticed this bug causing issues when using MiniTest and Mocha in Ruby 1.8, but there may well be other issues.
| * Copy Mocha bug fix.James Mead2012-11-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | A bug was fixed [1] in Mocha's integration with Test::Unit, but this monkey-patching code was copied before the fix. We need to copy the fixed version. The bug meant that an unexpected invocation against a mock within the teardown method caused a test *error* and not a test *failure*. [1] https://github.com/freerange/mocha/commit/f1ff6475ca2871f2977ab84cabbbfe2adadbbee6#diff-5
* | backport #8185, `#as_json` isolates options when encoding a hash.Yves Senn2012-11-133-1/+24
|/ | | | | | | | | | Setting options in a custom `#as_json` method had side effects. Modifications of the `options` hash leaked outside and influenced the conversion of other objects contained in the hash. Conflicts: activesupport/CHANGELOG.md
* Add release date of Rails 3.2.9 to documentationclaudiob2012-11-121-1/+1
|
* Merge branch '3-2-9' into 3-2-stableSantiago Pastorino2012-11-121-1/+1
|\
| * Bump to 3.2.9Santiago Pastorino2012-11-121-1/+1
| |
* | Merge branch '3-2-9' into 3-2-stableSantiago Pastorino2012-11-091-1/+1
|\|
| * Bump up to 3.2.9.rc3Santiago Pastorino2012-11-091-1/+1
| |
* | Merge pull request #8027 from daenney/masterXavier Noria2012-11-082-2/+14
|/ | | | | | | | Atomic.rb assumes it may chown/chmod a file but doesn't handle the EPERM error. Conflicts: activesupport/CHANGELOG.md guides/source/active_support_core_extensions.md
* Bump to 3.2.9.rc2Santiago Pastorino2012-11-011-1/+1
|
* Bump to 3.2.9.rc1Santiago Pastorino2012-10-291-2/+2
|
* Merge pull request #8022 from GRoguelon/3-2-stableRafael Mendonça França2012-10-241-1/+1
|\ | | | | Adding a missing parenthesis in the doc of String#parameterize.
| * Adding a missing parenthesis in the doc of String#parameterize.Geoffrey Roguelon2012-10-241-1/+1
| |
* | Shush syntax warningsJeremy Kemper2012-09-281-3/+3
| |
* | Add logger.push_tags and .pop_tags to complement logger.taggedJeremy Kemper2012-09-273-18/+69
| | | | | | | | | | | | | | | | | | Avoid memory leak from unflushed logs on other threads leaving tags behind. Conflicts: activesupport/CHANGELOG.md activesupport/lib/active_support/tagged_logging.rb activesupport/test/tagged_logging_test.rb
* | Fix invalid ruby 1.8 syntaxRafael Mendonça França2012-09-211-4/+5
| |
* | Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z ↵kennyj2012-09-203-1/+16
| | | | | | | | format strings.
* | Fix AS tests due to builder change with nil values / empty stringsCarlos Antonio da Silva2012-09-071-2/+2
|/ | | | | Check 0180e090ab6cbe66f7b521a0c03e278a0463accd for more reasoning about that.
* CHANGELOGs are now per branchXavier Noria2012-08-281-1591/+1
| | | | Check 810a50d for the rationale.
* fixes a bug in dependencies.rbXavier Noria2012-08-281-1/+1
| | | | | | | loaded stores file names without the .rb extension, but search_for_file returns file names with the extension. The solution is hackish, but this file needs a revamp.
* Add html_escape note to CHANGELOGMark Turner2012-08-091-0/+2
|
* Bump to 3.2.8Santiago Pastorino2012-08-091-1/+1
|
* Add release date to CHANGELOGsSantiago Pastorino2012-08-091-1/+1
|
* Bump to 3.2.8.rc2Santiago Pastorino2012-08-031-1/+1
|
* Add CHANGELOG entrySantiago Pastorino2012-08-031-0/+2
|
* Fix html_escape with Ruby 1.8Rafael Mendonça França2012-08-021-15/+26
|
* html_escape should escape single quotesSantiago Pastorino2012-08-022-30/+18
| | | | | | | | | | | | https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content Closes #7215 Conflicts: actionpack/test/template/erb_util_test.rb actionpack/test/template/form_tag_helper_test.rb actionpack/test/template/text_helper_test.rb actionpack/test/template/url_helper_test.rb activesupport/lib/active_support/core_ext/string/output_safety.rb
* Fix ActiveSupport integration with Mocha > 0.12.1Mike Gunderloy2012-08-021-1/+3
| | | | | | Mocha 0.12.2 renames the Integration module to MonkeyPatching. This breaks the code Rails uses to retrieve the assertion counter from Mocha.
* Bump to 3.2.8.rc1Santiago Pastorino2012-08-011-2/+2
|
* Revert "Deprecate ActiveSupport::JSON::Variable"Rafael Mendonça França2012-08-013-23/+14
| | | | This reverts commit bcfa013399fd2c5b5d25c38912cba3560de1cc57.
* Add missing CHANGELOG entriesSantiago Pastorino2012-08-011-2/+6
| | | | [ci skip]
* updating release dateAaron Patterson2012-07-261-1/+1
|
* bumping to 3.2.7Aaron Patterson2012-07-261-1/+1
|
* updating the versionAaron Patterson2012-07-231-2/+2
|
* updating changelogsAaron Patterson2012-07-231-0/+8
|
* Hash#fetch(fetch) is not the same as doing hash[key]Xavier Noria2012-07-211-1/+11
|
* adds a missing require [fixes #6896]Xavier Noria2012-07-152-1/+1
| | | | | This file uses Time.zone, which is defined in active_support/core_ext/time/zones.rb.
* make sure the inflection rules are loaded when cherry-picking ↵Xavier Noria2012-06-293-0/+5
| | | | active_support/core_ext/string/inflections.rb [fixes #6884]
* Merge pull request #6857 from rsutphin/as_core_ext_time_missing_requireCarlos Antonio da Silva2012-06-251-0/+1
| | | | Missing require breaks Time.=== when selectively loading ActiveSupport core_exts in 3.2.4+
* bump AS deprecation_horizon to 4.0Francesco Rodríguez2012-06-171-2/+2
|
* updating changelogsAaron Patterson2012-06-121-1/+1
|
* bumping version numbersAaron Patterson2012-06-111-1/+1
|
* updating changelogsAaron Patterson2012-06-111-0/+4
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 01:12:22 +0000