Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | 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 | |
| | | ||||||
* | | True, False, and Nil should be represented in as_json as themselves. | Erich Menge | 2012-05-30 | 2 | -6/+12 | |
| | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/json/encoding.rb activesupport/test/json/encoding_test.rb | |||||
* | | Exceptions like Interrupt should not be rescued in tests. | James Mead | 2012-05-29 | 2 | -2/+47 | |
|/ | | | | | 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 Sarnacki | 2012-05-20 | 1 | -0/+4 | |
| | | | | [ci skip] closes #5790 | |||||
* | Backporting some docs on core_ext/hash | Francesco Rodriguez | 2012-05-15 | 3 | -4/+23 | |
| | ||||||
* | adding examples and docs | Francesco Rodriguez | 2012-05-12 | 3 | -1/+22 | |
| | ||||||
* | Update performance profiler to work with latest ruby-prof | Arun Agrawal | 2012-05-11 | 1 | -1/+1 | |
| | | | | Thanks to @carlosantoniodasilva | |||||
* | Add CHANGELOG section for unreleased Rails 3.2.4; document addition of ↵ | Mark J. Titorenko | 2012-05-09 | 1 | -0/+6 | |
| | | | | #beginning_of_hour and #end_of_hour to Time and DateTime core extensions. | |||||
* | Bring activesupport CHANGELOG up-to-date/consistent with master. | Mark J. Titorenko | 2012-05-09 | 1 | -1/+59 | |
| | ||||||
* | fix attribute_accessors docs to support 1.8 syntax | Francesco Rodriguez | 2012-05-09 | 1 | -11/+11 | |
| | ||||||
* | removing docs duplication | Francesco Rodriguez | 2012-05-08 | 1 | -23/+0 | |
| | ||||||
* | Merge pull request #6211 from frodsan/docs_attr_accessor_32stable | Vijay Dev | 2012-05-08 | 1 | -0/+111 | |
|\ | | | | | Adding docs to attribute accessor methods. | |||||
| * | added docs to attribute_accessors methods | Francesco Rodriguez | 2012-05-08 | 1 | -0/+111 | |
| | | ||||||
* | | added beginning_of_hour support to core_ext calculations for Time and DateTime | Mark J. Titorenko | 2012-05-04 | 5 | -0/+56 | |
|/ | ||||||
* | Correcting some confusion. Pago Pago is part of American Samoa, not Samoa. | Dave Gerton | 2012-04-30 | 1 | -2/+4 | |
| | | | | | | | | | Further, Samoa and Tokelau jumped across the IDL from Dec 29 to Dec 31, 2011 switching from UTC-11 to UTC+13. American Samoa did not make the change and remains at UTC-11. Pacific/Fakaofo and Pacific/Apia are in TZInfo and documentation about the dateline change is in austalasia at IANA. (cherry picked from commit 1d08ce5f56e45fdee41bb16b2d8d4464bc69bf22) | |||||
* | Add release data to Rails 3.2.3 | Rafael Mendonça França | 2012-04-30 | 1 | -1/+1 | |
| | ||||||
* | Remove circular require of time/zones | Oscar Del Ben | 2012-04-29 | 1 | -1/+0 | |
| | ||||||
* | Updated other README to point 3-2-stable | Arun Agrawal | 2012-04-23 | 1 | -1/+1 | |
| | ||||||
* | Use `Object#respond_to?` to determine which MultiJson API to use | Erik Michaels-Ober | 2012-04-18 | 1 | -3/+17 | |
| | ||||||
* | Revert "multi_json is restricted to < 1.3 " | Erik Michaels-Ober | 2012-04-18 | 1 | -1/+1 | |
| | | | | This reverts commit 9b14e3ff80ee4044cfd89a11effcb5f52eaf888b. | |||||
* | Merge pull request #5861 from arunagw/multi_json_fix_3-2-stable | Jeremy Kemper | 2012-04-16 | 1 | -1/+1 | |
|\ | | | | | Restrict multi_json to >= 1.0, < 1.3 to avoid API changes in 1.3 |