Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Test to allow Range including DateTime and DateTime::Infinity | gsphanikumar | 2013-01-13 | 1 | -0/+6 |
| | | | | Closes #8587 | ||||
* | Merge branch '3-2-sec' into 3-2-secmerge | Aaron Patterson | 2013-01-08 | 1 | -6/+22 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-sec: bumping version CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu Avoid Rack security warning no secret provided Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md | ||||
| * | CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. | Jeremy Kemper | 2013-01-08 | 1 | -6/+22 |
| | | |||||
* | | Wrap time ranges with timezones, closes #8807 | Vasiliy Ermolovich | 2013-01-08 | 3 | -32/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit e2e513621d732abb8efff9120bd9a444836720d6) (cherry picked from commit dcdde7da481e11660634278a8004175a1ce20f39) Backport of #6183, original issue was #6179 Conflicts: activesupport/lib/active_support/core_ext/time/calculations.rb activesupport/test/core_ext/time_ext_test Signed-off-by: Andrew White <andyw@pixeltrix.co.uk> | ||||
* | | 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 | ||||
* | 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 | ||||
* | 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 |
| | |||||
* | 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 |
| | |||||
* | test base64 encode and decode | Vijay Dev | 2012-01-23 | 1 | -0/+9 |
| | |||||
* | deprecate ActiveSupport::Base64 | Sergey Nartimov | 2012-01-03 | 1 | -2/+4 |
| | | | | extend and define ::Base64 if needed | ||||
* | 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 "Added Enumerable#pluck to wrap the common pattern of ↵ | Aaron Patterson | 2011-12-22 | 1 | -8/+1 |
| | | | | | | collect(&:method) *DHH*" This reverts commit 4d20de8a50d889a09e6f5642984775fe796ca943. | ||||
* | Overrode Hash#nested_under_indifferent_access in HashWithIndifferentAccess | Miles Georgi | 2011-12-11 | 1 | -0/+3 |
| | | | | to return self. | ||||
* | Restore performance of ERB::Util.html_escape | Jon Jensen | 2011-12-03 | 1 | -6/+17 |
| | | | | | | | Revert html_escape to do a single gsub again, but add the "n" flag (no language, i.e. not multi-byte) to protect against XSS via invalid utf8 Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Added Enumerable#pluck to wrap the common pattern of collect(&:method) *DHH* | David Heinemeier Hansson | 2011-12-02 | 1 | -1/+8 |
| | |||||
* | Module#synchronize is deprecated with no replacement. Please use `monitor` ↵ | Aaron Patterson | 2011-11-29 | 1 | -89/+0 |
| | | | | from ruby's standard library. | ||||
* | Merge pull request #3767 from tadast/object_in | Yehuda Katz | 2011-11-26 | 1 | -0/+10 |
|\ | | | | | Object#in? also accepts multiple parameters | ||||
| * | Object#in? also accepts multiple parameters | Tadas Tamošauskas | 2011-11-26 | 1 | -0/+10 |
| | | |||||
* | | add more tests for monday and sunday methods | Vijay Dev | 2011-11-26 | 1 | -0/+2 |
| | | |||||
* | | Tests added for monday and sunday | Arun Agrawal | 2011-11-26 | 1 | -0/+8 |
| | | | | | | | | | | Reference commits : a8f2860d0e7db86c61bb70935006100b04667ab1 80ac4dc6d0632937ccf61b38bc15fc2f6e27b18b | ||||
* | | beginning_of_week extended in both Time and Date so that to return week ↵ | gregolsen | 2011-11-25 | 2 | -0/+38 |
| | | | | | | | | start based on start day that is monday by default | ||||
* | | Merge pull request #3725 from marcandre/twz_eql | Yehuda Katz | 2011-11-22 | 2 | -2/+15 |
|\ \ | |/ |/| | Fix inconsistencies with Time{WithZone}#{hash,eql?} | ||||
| * | Fix inconsistencies with Time{WithZone}#{hash,eql?} | Marc-Andre Lafortune | 2011-11-22 | 2 | -2/+15 |
| | | |||||
* | | refactor test_multiple_of | Vijay Dev | 2011-11-16 | 1 | -4/+3 |
| | | |||||
* | | Merge pull request #3549 from luckydev/rmethod | Aaron Patterson | 2011-11-07 | 1 | -0/+29 |
|\ \ | | | | | | | remove_method tests and changes | ||||
| * | | added remove_method core_ext tests | Anand | 2011-11-07 | 1 | -0/+29 |
| |/ | |||||
* / | Removed argument throwing warnings when running tests. | Henrik Hodne | 2011-11-06 | 2 | -16/+16 |
|/ | | | | | | | | The last argument to DateTime.new/civil is the Julian day number for when the calendar reform occured. DateTime ignores it if it's 0, and sets it to the default of DateTime::ITALY instead, so we could just leave it out. This also removes the warnings while running the ActiveSupport tests (there still are some for the setup though). | ||||
* | defines Module#qualified_const_(defined?|get|set) and String#deconstantize | Xavier Noria | 2011-10-29 | 2 | -0/+98 |
| | | | | | | | | | | This commit also implements a faster version of #demodulize I was unable to isolate with git add --patch. Not a big fan of the name #deconstantize. It complements #demodulize getting rid of the rightmost constant, hence the name, but it is unrelated to the well-known #constantize. So unsure. Could not come with anything better, please feel free to rename. | ||||
* | Merge pull request #3151 from zenprogrammer/pluralize_without_count | José Valim | 2011-10-17 | 1 | -4/+8 |
|\ | | | | | Added include_count parameter to pluralize. | ||||
| * | Modified String#pluralize to take an optional count parameter. | Ryan Oblak | 2011-09-28 | 1 | -4/+8 |
| | | |||||
* | | Fixed test_nonexisting_method_with_arguments to revert commit 29a5aea | Yasuo Honda | 2011-10-06 | 1 | -1/+1 |
| | | |||||
* | | Revert "don't raise NoMethodError the tried method doesn't exists" | José Valim | 2011-10-06 | 1 | -1/+1 |
| | | | | | | | | This reverts commit 29a5aeaae976bf8432d57ec996c7c81932a39de6. | ||||
* | | Merge pull request #2801 from jeremyevans/patch-1 | Jeremy Kemper | 2011-10-03 | 1 | -0/+3 |
|\ \ | |/ |/| | Fix obviously breakage of Time.=== for Time subclasses | ||||
| * | Add tests for fixes to Time.=== | Jeremy Evans | 2011-09-07 | 1 | -0/+3 |
| | | |||||
* | | Added ActiveSupport::Inflector.safe_constantize and String#safe_constantize; ↵ | Ryan Oblak | 2011-09-23 | 1 | -1/+22 |
| | | | | | | | | refactored common constantize tests into ConstantizeTestCases | ||||
* | | Fix test to reflect use of to_param for keys | brainopia | 2011-09-18 | 1 | -8/+8 |
| | | |||||
* | | Fix Hash#to_query edge case with html_safe string on 1.8 ruby | brainopia | 2011-09-16 | 1 | -0/+9 |
| | | |||||
* | | We can't simply check the first line of the backtrace, | Arun Agrawal | 2011-09-04 | 1 | -4/+6 |
|/ | | | because JRuby reports the call to __send__ in the backtrace. | ||||
* | Revert all the stuff to do with disallowing non-public methods for ↵ | Jon Leighton | 2011-08-25 | 2 | -136/+1 |
| | | | | Module#delegate | ||||
* | Remove trailing whitespace | Daniel Schierbeck | 2011-08-23 | 1 | -2/+2 |
| | |||||
* | properly escape html to avoid invalid utf8 causing XSS attacks | Aaron Patterson | 2011-08-16 | 1 | -0/+7 |
| | |||||
* | Added Array#prepend as an alias for Array#unshift and Array#append as an ↵ | David Heinemeier Hansson | 2011-08-15 | 1 | -0/+10 |
| | | | | alias for Array#<< [DHH] | ||||
* | Add a test for delegating a method ending in '=' as this is a special case. | Jon Leighton | 2011-08-15 | 1 | -0/+8 |
| | |||||
* | Split up the definitions in Module#delegate depending on :allow_nil, and ↵ | Jon Leighton | 2011-08-15 | 1 | -0/+12 |
| | | | | don't use exceptions for flow control in the :allow_nil => true case. |