aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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-081-2/+7
|/ | | | | | | | 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-271-18/+28
| | | | | | | | | | | | | | | | | | 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-201-1/+4
|/ | | | format strings.
* 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.
* Bump to 3.2.8Santiago Pastorino2012-08-091-1/+1
|
* Bump to 3.2.8.rc2Santiago Pastorino2012-08-031-1/+1
|
* Fix html_escape with Ruby 1.8Rafael Mendonça França2012-08-021-15/+26
|
* html_escape should escape single quotesSantiago Pastorino2012-08-021-28/+16
| | | | | | | | | | | | 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-011-9/+1
| | | | This reverts commit bcfa013399fd2c5b5d25c38912cba3560de1cc57.
* bumping to 3.2.7Aaron Patterson2012-07-261-1/+1
|
* updating the versionAaron Patterson2012-07-231-2/+2
|
* 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
|
* bumping version numbersAaron Patterson2012-06-111-1/+1
|
* Merge pull request #6688 from ↵Rafael Mendonça França2012-06-101-2/+2
|\ | | | | | | | | c42engineering/buffered_logger_level_while_creation BufferedLogger level while creation
| * buffered logger is initialized with the log level passed trough the initializerNiranjan Paranjape2012-06-091-2/+2
| |
* | fix namespace collision with test-unit-activesupportJens Kraemer2012-06-101-1/+1
|/
* bumping to 3.2.5Aaron Patterson2012-05-311-1/+1
|
* Merge branch '3-2-rel' into 3-2-stableAaron Patterson2012-05-311-1/+1
|\ | | | | | | | | | | | | | | * 3-2-rel: bumping to 3.2.4 adding security notifications to CHANGELOGs updating changelogs Merge pull request #6558 from parndt/fix_regression
| * bumping to 3.2.4Aaron Patterson2012-05-311-1/+1
| |
* | Merge branch '3-2-stable-sec' into 3-2-stableAaron Patterson2012-05-311-2/+2
|\| | | | | | | | | | | | | * 3-2-stable-sec: Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this! predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this bumping to 3.2.4.rc1
| * bumping to 3.2.4.rc1Aaron Patterson2012-05-281-2/+2
| |
* | Deprecate ActiveSupport::JSON::VariableErich Menge2012-05-301-1/+9
| |
* | True, False, and Nil should be represented in as_json as themselves.Erich Menge2012-05-301-6/+6
| | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/json/encoding.rb activesupport/test/json/encoding_test.rb
* | Exceptions like Interrupt should not be rescued in tests.James Mead2012-05-291-0/+5
|/ | | | | This is a back-port of rails/rails#6525. See the commit notes there for details.
* Improve docs for `try` by adding note on `BasicObject`Piotr Sarnacki2012-05-201-0/+4
| | | | [ci skip] closes #5790
* Backporting some docs on core_ext/hashFrancesco Rodriguez2012-05-153-4/+23
|
* adding examples and docsFrancesco Rodriguez2012-05-123-1/+22
|
* Update performance profiler to work with latest ruby-profArun Agrawal2012-05-111-1/+1
| | | | Thanks to @carlosantoniodasilva
* fix attribute_accessors docs to support 1.8 syntaxFrancesco Rodriguez2012-05-091-11/+11
|
* removing docs duplicationFrancesco Rodriguez2012-05-081-23/+0
|
* Merge pull request #6211 from frodsan/docs_attr_accessor_32stableVijay Dev2012-05-081-0/+111
|\ | | | | Adding docs to attribute accessor methods.
| * added docs to attribute_accessors methodsFrancesco Rodriguez2012-05-081-0/+111
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 08:07:32 +0000