Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use 1.8 style hash in json encoding test | Carlos Antonio da Silva | 2012-12-14 | 1 | -1/+1 |
| | |||||
* | Remove unicode character encoding from ActiveSupport::JSON.encode | Brett Carter | 2012-12-14 | 1 | -3/+16 |
| | | | | | | | | | | | | | | | | | | The encoding scheme (e.g. ☠ -> "\u2620") was broken for characters not in the Basic Multilingual Plane. It is possible to escape them for json using the weird encoding scheme of a twelve-character sequence representing the UTF-16 surrogate pair (e.g. '𠜎' -> "\u270e\u263a") but this wasn't properly handled in the escaping code. Since raw UTF-8 is allowed in json, it was decided to simply pass through the raw bytes rather than attempt to escape them. Backport of https://github.com/zbskii/rails/commit/9ace3a8820a5270f9b3f37b593f8bbea3e940f73 Conflicts: activesupport/CHANGELOG.md activesupport/lib/active_support/json/encoding.rb activesupport/test/json/encoding_test.rb | ||||
* | Add :nsec format only for Ruby 1.9 | Carlos Antonio da Silva | 2012-12-11 | 1 | -9/+9 |
| | | | | | | Ruby 1.8 does not support this format in Time, so the format will only be added to the available date formats on Ruby 1.9. Changelog entry was changed to explain that as well. | ||||
* | Merge pull request #6376 from jgaskins/timestamp-microseconds | Jeremy Kemper | 2012-12-10 | 1 | -1/+3 |
| | | | | | | Increase numeric-timestamp precision to nanoseconds Conflicts: activesupport/lib/active_support/core_ext/time/conversions.rb | ||||
* | Update mocha version to 0.13.0 and change requires | Carlos Antonio da Silva | 2012-11-13 | 1 | -1/+1 |
| | |||||
* | Fix json encoding test with ruby 1.8.7 and random hash order | Carlos Antonio da Silva | 2012-11-13 | 1 | -1/+2 |
| | | | | Introduced in 3e53fe6. | ||||
* | backport #8185, `#as_json` isolates options when encoding a hash. | Yves Senn | 2012-11-13 | 1 | -0/+18 |
| | | | | | | | | | | 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 logger.push_tags and .pop_tags to complement logger.tagged | Jeremy Kemper | 2012-09-27 | 1 | -0/+27 |
| | | | | | | | | | 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 #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z ↵ | kennyj | 2012-09-20 | 1 | -0/+8 |
| | | | | 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. | ||||
* | html_escape should escape single quotes | Santiago Pastorino | 2012-08-02 | 1 | -2/+2 |
| | | | | | | | | | | | | 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 | ||||
* | Revert "Deprecate ActiveSupport::JSON::Variable" | Rafael Mendonça França | 2012-08-01 | 1 | -8/+3 |
| | | | | This reverts commit bcfa013399fd2c5b5d25c38912cba3560de1cc57. | ||||
* | buffered logger is initialized with the log level passed trough the initializer | Niranjan Paranjape | 2012-06-09 | 1 | -0/+5 |
| | |||||
* | Deprecate ActiveSupport::JSON::Variable | Erich Menge | 2012-05-30 | 1 | -3/+8 |
| | |||||
* | True, False, and Nil should be represented in as_json as themselves. | Erich Menge | 2012-05-30 | 1 | -0/+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 Mead | 2012-05-29 | 1 | -2/+42 |
| | | | | | This is a back-port of rails/rails#6525. See the commit notes there for details. | ||||
* | added beginning_of_hour support to core_ext calculations for Time and DateTime | Mark J. Titorenko | 2012-05-04 | 3 | -0/+30 |
| | |||||
* | bigdecimal can be duped on Ruby 2.0 | Aaron Patterson | 2012-04-10 | 1 | -2/+10 |
| | | | | | | Conflicts: activesupport/test/core_ext/duplicable_test.rb | ||||
* | add the class name to the assertion message | Aaron Patterson | 2012-04-10 | 1 | -1/+1 |
| | |||||
* | Ensure load hooks can be called more than once with different contexts. | José Valim | 2012-03-17 | 1 | -0/+29 |
| | |||||
* | Merge branch '3-2-stable-security' into 3-2-2 | Aaron Patterson | 2012-03-01 | 1 | -9/+38 |
|\ | | | | | | | | | | | | | | | | | * 3-2-stable-security: Ensure [] respects the status of the buffer. delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options | ||||
| * | Ensure [] respects the status of the buffer. | José Valim | 2012-02-29 | 1 | -5/+31 |
| | | |||||
| * | delete vulnerable AS::SafeBuffer#[] | Akira Matsuda | 2012-02-20 | 1 | -6/+0 |
| | | |||||
| * | add AS::SafeBuffer#clone_empty | Akira Matsuda | 2012-02-20 | 1 | -0/+9 |
| | | |||||
* | | Fix some warnings on 3-2-stable | kennyj | 2012-02-21 | 1 | -1/+1 |
|/ | |||||
* | Fixes failing test with ruby 1.8.7-p358 | Arun Agrawal | 2012-02-17 | 1 | -2/+2 |
| | | | Same as 91a9b2441783de118a2f9ec11b0aa3ae80133d91 | ||||
* | GH #4883. Optional start_day argument for Time#all_week | kennyj | 2012-02-05 | 1 | -0/+1 |
| | |||||
* | Fix GH #4760. A Block was not evaluated. | kennyj | 2012-01-31 | 1 | -0/+8 |
| | |||||
* | Revert "Fix expanding cache key for single element arrays" | David Heinemeier Hansson | 2012-01-27 | 1 | -15/+7 |
| | | | | | | This reverts commit abe915f23777efe10f17d611bf5718ca855a0704. This broke all existing keys and it's wrong anyway. The array is just there as a convenience option for building the string. It's intentional that [ "stuff"] and "stuff" generates the same key. | ||||
* | safe_constantize should handle wrong constant name NameErrors Fixes #4710 | Alex Tambellini | 2012-01-26 | 1 | -2/+3 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | global variables may not be set depending on the match. fixes #4703 | Aaron Patterson | 2012-01-26 | 1 | -0/+4 |
| | |||||
* | Fix GH #4344. A defined callback in extended module is called too. | kennyj | 2012-01-24 | 1 | -4/+61 |
| | | | | | | Conflicts: activesupport/test/callbacks_test.rb | ||||
* | test base64 encode and decode | Vijay Dev | 2012-01-23 | 1 | -0/+9 |
| | |||||
* | Remove deprecation warning from console output when running | Waseem Ahmad | 2012-01-22 | 1 | -1/+3 |
| | | | | activesupport tests. | ||||
* | Fix GH #4580. Rails 3.2: uninitialized constant ↵ | kennyj | 2012-01-22 | 1 | -0/+4 |
| | | | | ActiveSupport::TaggedLogging::ERROR | ||||
* | deprecate ActiveSupport::Base64 | Sergey Nartimov | 2012-01-03 | 2 | -5/+7 |
| | | | | extend and define ::Base64 if needed | ||||
* | Merge pull request #4227 from gazay/3-2-stable-marshalling | Aaron Patterson | 2011-12-30 | 1 | -0/+15 |
|\ | | | | | 3 2 stable marshalling | ||||
| * | Backward compatibility with 3.1 cache storing | Alexey Gaziev | 2011-12-29 | 1 | -0/+15 |
| | | |||||
* | | refactor Range#include? to handle ranges with floats | Sergey Nartimov | 2011-12-30 | 1 | -0/+4 |
|/ | | | | | | Conflicts: activesupport/lib/active_support/core_ext/range/include_range.rb | ||||
* | Revert "Merge pull request #4196 from gazay/3-2-stable-marshalling" | Aaron Patterson | 2011-12-28 | 1 | -15/+0 |
| | | | | | This reverts commit df3701872d6c97ff49943aea30761b47e60fa9fe, reversing changes made to a0fd9fb01730af12d66a27b5665cc010bd3b90b4. | ||||
* | Safe getting value from cache entry | Alexey Gaziev | 2011-12-27 | 1 | -0/+15 |
| | |||||
* | delegating and deprecating logger#silence. fixes #4159 | Aaron Patterson | 2011-12-24 | 1 | -16/+25 |
| | |||||
* | Revert "Added Enumerable#pluck to wrap the common pattern of ↵ | Aaron Patterson | 2011-12-22 | 1 | -8/+1 |
| | | | | | | collect(&:method) *DHH*" This reverts commit 4d20de8a50d889a09e6f5642984775fe796ca943. | ||||
* | Merge pull request #4007 from exviva/expand_cache_key_for_one_element_array | José Valim | 2011-12-16 | 1 | -7/+15 |
|\ | | | | | Fix expanding cache key for single element arrays | ||||
| * | Fix expanding cache key for single element arrays | Olek Janiszewski | 2011-12-16 | 1 | -7/+15 |
| | | | | | | | | | | | | | | | | | | In short: expand_cache_key(element) should not equal expand_cache_key([element]) This way a fragment cache key for an index page with only a single element in the collection is different than a fragment cache for a typical show page for that element. | ||||
* | | FileUpdateChecker should be able to handle deleted files. | José Valim | 2011-12-13 | 1 | -21/+15 |
| | | |||||
* | | Clean up FileUpdateChecker API. | José Valim | 2011-12-13 | 1 | -1/+1 |
| | | |||||
* | | missing require in activesupport test | lest | 2011-12-13 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #3954 from bdurand/null_store_2 | José Valim | 2011-12-12 | 1 | -6/+64 |
|\ \ | | | | | | | Add ActiveSupport::Cache::NullStore for testing and development | ||||
| * | | Add ActiveSupport::Cache::NullStore to expose caching interface without ↵ | Brian Durand | 2011-12-12 | 1 | -6/+64 |
| | | | | | | | | | | | | actually caching for development and test environments. |