Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '3-2-9' into 3-2-stable | Santiago Pastorino | 2012-11-12 | 1 | -1/+1 |
|\ | |||||
| * | Bump to 3.2.9 | Santiago Pastorino | 2012-11-12 | 1 | -1/+1 |
| | | |||||
* | | Merge branch '3-2-9' into 3-2-stable | Santiago Pastorino | 2012-11-09 | 1 | -1/+1 |
|\| | |||||
| * | Bump up to 3.2.9.rc3 | Santiago Pastorino | 2012-11-09 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #8027 from daenney/master | Xavier Noria | 2012-11-08 | 2 | -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.rc2 | Santiago Pastorino | 2012-11-01 | 1 | -1/+1 |
| | |||||
* | Bump to 3.2.9.rc1 | Santiago Pastorino | 2012-10-29 | 1 | -2/+2 |
| | |||||
* | Merge pull request #8022 from GRoguelon/3-2-stable | Rafael Mendonça França | 2012-10-24 | 1 | -1/+1 |
|\ | | | | | Adding a missing parenthesis in the doc of String#parameterize. | ||||
| * | Adding a missing parenthesis in the doc of String#parameterize. | Geoffrey Roguelon | 2012-10-24 | 1 | -1/+1 |
| | | |||||
* | | Shush syntax warnings | Jeremy Kemper | 2012-09-28 | 1 | -3/+3 |
| | | |||||
* | | Add logger.push_tags and .pop_tags to complement logger.tagged | Jeremy Kemper | 2012-09-27 | 3 | -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 syntax | Rafael Mendonça França | 2012-09-21 | 1 | -4/+5 |
| | | |||||
* | | Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z ↵ | kennyj | 2012-09-20 | 3 | -1/+16 |
| | | | | | | | | format strings. | ||||
* | | Fix AS tests due to builder change with nil values / empty strings | Carlos Antonio da Silva | 2012-09-07 | 1 | -2/+2 |
|/ | | | | | Check 0180e090ab6cbe66f7b521a0c03e278a0463accd for more reasoning about that. | ||||
* | CHANGELOGs are now per branch | Xavier Noria | 2012-08-28 | 1 | -1591/+1 |
| | | | | Check 810a50d for the rationale. | ||||
* | fixes a bug in dependencies.rb | Xavier Noria | 2012-08-28 | 1 | -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 CHANGELOG | Mark Turner | 2012-08-09 | 1 | -0/+2 |
| | |||||
* | Bump to 3.2.8 | Santiago Pastorino | 2012-08-09 | 1 | -1/+1 |
| | |||||
* | Add release date to CHANGELOGs | Santiago Pastorino | 2012-08-09 | 1 | -1/+1 |
| | |||||
* | Bump to 3.2.8.rc2 | Santiago Pastorino | 2012-08-03 | 1 | -1/+1 |
| | |||||
* | Add CHANGELOG entry | Santiago Pastorino | 2012-08-03 | 1 | -0/+2 |
| | |||||
* | Fix html_escape with Ruby 1.8 | Rafael Mendonça França | 2012-08-02 | 1 | -15/+26 |
| | |||||
* | html_escape should escape single quotes | Santiago Pastorino | 2012-08-02 | 2 | -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.1 | Mike Gunderloy | 2012-08-02 | 1 | -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.rc1 | Santiago Pastorino | 2012-08-01 | 1 | -2/+2 |
| | |||||
* | Revert "Deprecate ActiveSupport::JSON::Variable" | Rafael Mendonça França | 2012-08-01 | 3 | -23/+14 |
| | | | | This reverts commit bcfa013399fd2c5b5d25c38912cba3560de1cc57. | ||||
* | Add missing CHANGELOG entries | Santiago Pastorino | 2012-08-01 | 1 | -2/+6 |
| | | | | [ci skip] | ||||
* | updating release date | Aaron Patterson | 2012-07-26 | 1 | -1/+1 |
| | |||||
* | bumping to 3.2.7 | Aaron Patterson | 2012-07-26 | 1 | -1/+1 |
| | |||||
* | updating the version | Aaron Patterson | 2012-07-23 | 1 | -2/+2 |
| | |||||
* | updating changelogs | Aaron Patterson | 2012-07-23 | 1 | -0/+8 |
| | |||||
* | Hash#fetch(fetch) is not the same as doing hash[key] | Xavier Noria | 2012-07-21 | 1 | -1/+11 |
| | |||||
* | adds a missing require [fixes #6896] | Xavier Noria | 2012-07-15 | 2 | -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 Noria | 2012-06-29 | 3 | -0/+5 |
| | | | | active_support/core_ext/string/inflections.rb [fixes #6884] | ||||
* | Merge pull request #6857 from rsutphin/as_core_ext_time_missing_require | Carlos Antonio da Silva | 2012-06-25 | 1 | -0/+1 |
| | | | | Missing require breaks Time.=== when selectively loading ActiveSupport core_exts in 3.2.4+ | ||||
* | bump AS deprecation_horizon to 4.0 | Francesco Rodríguez | 2012-06-17 | 1 | -2/+2 |
| | |||||
* | updating changelogs | Aaron Patterson | 2012-06-12 | 1 | -1/+1 |
| | |||||
* | bumping version numbers | Aaron Patterson | 2012-06-11 | 1 | -1/+1 |
| | |||||
* | updating changelogs | Aaron Patterson | 2012-06-11 | 1 | -0/+4 |
| | |||||
* | Merge pull request #6688 from ↵ | Rafael Mendonça França | 2012-06-10 | 2 | -2/+7 |
|\ | | | | | | | | | c42engineering/buffered_logger_level_while_creation BufferedLogger level while creation | ||||
| * | buffered logger is initialized with the log level passed trough the initializer | Niranjan Paranjape | 2012-06-09 | 2 | -2/+7 |
| | | |||||
* | | fix namespace collision with test-unit-activesupport | Jens Kraemer | 2012-06-10 | 1 | -1/+1 |
|/ | |||||
* | Add release date of 3.2.5 on the CHANGELOG | Rafael Mendonça França | 2012-06-01 | 1 | -3/+6 |
| | |||||
* | bumping to 3.2.5 | Aaron Patterson | 2012-05-31 | 1 | -1/+1 |
| | |||||
* | Merge branch '3-2-rel' into 3-2-stable | Aaron Patterson | 2012-05-31 | 2 | -2/+2 |
|\ | | | | | | | | | | | | | | | * 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.4 | Aaron Patterson | 2012-05-31 | 1 | -1/+1 |
| | | |||||
| * | updating changelogs | Aaron Patterson | 2012-05-31 | 1 | -1/+1 |
| | | |||||
* | | Merge branch '3-2-stable-sec' into 3-2-stable | Aaron Patterson | 2012-05-31 | 1 | -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.rc1 | Aaron Patterson | 2012-05-28 | 1 | -2/+2 |
| | | |||||
* | | Deprecate ActiveSupport::JSON::Variable | Erich Menge | 2012-05-30 | 3 | -4/+20 |
| | |