aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Incorrectly providing program name the same as log message even when block ↵Carson Reinke2013-07-013-2/+23
| | | | is not provided.
* Backport rails/rails-perftest#2 to fix rake test:benchmarkYves Senn2013-06-274-4/+4
|
* Override Time.at to work with Time-like valuesAndrew White2013-06-083-0/+38
| | | | | | | Time.at allows passing a single Time argument which is then converted to an integer. The conversion code since 1.9.3r429 explicitly checks for an instance of Time so we need to override it to allow DateTime and ActiveSupport::TimeWithZone values.
* Add CHANGELOG entry removed by mistake [ci skip]Rafael Mendonça França2013-05-111-0/+7
|
* Fix test to ruby 2.0Rafael Mendonça França2013-05-101-2/+9
| | | | The default enconding changed on Ruby 2.0
* Revert "Remove unicode character encoding from ActiveSupport::JSON.encode"Rafael Mendonça França2013-05-083-23/+23
| | | | | | | | | | | | This reverts commit 815a9431ab61376a7e8e1bdff21f87bc557992f8. Conflicts: activesupport/test/json/encoding_test.rb Reason: This was causing a regression where the resulting string is always returning UTF-8. Also it changes the behavior of this method on a stable release. Fixes #9498.
* Add release dates to documentation [ci skip]claudiob2013-03-181-1/+1
| | | | Set "March 18, 2013" as the release date for 3.2.13
* Fix method name indent [ci skip]Carlos Antonio da Silva2013-03-181-1/+1
|
* Fix changelog conflicts and remove release dates [ci skip]Carlos Antonio da Silva2013-03-181-1/+1
|
* Merge branch '3-2-13' into 3-2-stableAaron Patterson2013-03-187-5/+48
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-13: bumping to 3.2.13 fix protocol checking in sanitization [CVE-2013-1857] JDOM XXE Protection [CVE-2013-1856] fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] stop calling to_sym when building arel nodes [CVE-2013-1854] Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets bumping to rc2 Revert "Merge pull request #8209 from senny/backport_8176" Freeze columns only once per Result Preparing for 3.2.13.rc1 release Update CHANGELOGs for 3.2.13 release. Conflicts: actionmailer/CHANGELOG.md actionpack/CHANGELOG.md activemodel/CHANGELOG.md activeresource/CHANGELOG.md activesupport/CHANGELOG.md railties/CHANGELOG.md
| * bumping to 3.2.13Aaron Patterson2013-03-181-1/+1
| |
| * JDOM XXE Protection [CVE-2013-1856]Ben Murphy2013-03-155-3/+45
| | | | | | | | | | Conflicts: activesupport/test/xml_mini/jdom_engine_test.rb
| * bumping to rc2Aaron Patterson2013-03-061-1/+1
| |
| * Preparing for 3.2.13.rc1 releaseSteve Klabnik2013-02-271-2/+2
| |
| * Update CHANGELOGs for 3.2.13 release.Steve Klabnik2013-02-271-0/+6
| |
* | Fix `ActiveSupport::TimeZone.parse` when time is a local DST jumpAndrew White2013-03-133-7/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation `ActiveSupport::TimeZone.parse` used `Time.parse` which applies the system time DST rules to the parsed time. Instead we now use `Time.utc` and manually apply the offset. Backport tests from: 005d910624bbfa724b638426a000c8074d4201a2 c89b6c4cdce7ee55ed3665c099d914222fe0344a 03becb13099c439f6aea5058546bc8b0b19b8db8 Fixes #9678.
* | Update CHANGELOGs for 3.2.13.rc1Steve Klabnik2013-03-051-0/+5
| |
* | Enforce i18n version >= v0.6.4Carlos Antonio da Silva2013-02-271-1/+1
|/ | | | | v0.6.2 and v0.6.3 both have issues with Ruby 1.8.7, see https://github.com/svenfuchs/i18n/issues/192 for more info.
* Tighten up AS.gemspec.Steve Klabnik2013-02-261-1/+1
| | | | | Apparently 0.6.2 has a call to force_encoding, which is not around in 1.8.7.
* Update RUBY_VERSION check for performance testing to handle 2.0.0mikeycgto2013-02-241-1/+1
|
* added marshal_load and marshal_dump for ProxyTestResult. Behavior of ↵SHIBATA Hiroshi2013-02-241-2/+10
| | | | method_missing with Marshal.dump and Marshal.load is changing in ruby 2.0.0 later.
* Do not redirect cache logger to /dev/null in testPrem Sichanugrist2013-02-241-1/+0
| | | | | | | | | | For some reason, redirecting cache's logger to '/dev/null' resulting in a test failures and LoadError. I think it's because of Thread issue. Instead of trying to make every logger threadsafe for Rails 3.2, I think it's better to just don't set the logger for now. (Note: resetting the logger back to original value in the teardown block didn't fix the problem.)
* Ruby 2 compat. Hash[] now raises on bad elements rather than ignoring them. ↵Jeremy Kemper2013-02-241-1/+0
| | | | No sense over-testing this MRI-specific behavior. See ruby/ruby@8d6add973ebcb3b4c1efbfaf07786550a3e219af
* Make the tests pass with minitest 4.2Rafael Mendonça França2013-02-241-0/+3
|
* search private and protected methods for convert_keyAaron Patterson2013-02-243-4/+3
|
* Add in missing requiresPrem Sichanugrist2013-02-241-0/+2
|
* Do not put the version in unreleased changes [ci skip]Rafael Mendonça França2013-02-141-1/+1
|
* Fix the CHANGELOG headers [ci skip]Rafael Mendonça França2013-02-141-0/+2
|
* Fixed changelog typos [ci skip]Jon McCartie2013-02-141-1/+1
|
* Update changelogs with version/release dates [ci skip]Carlos Antonio da Silva2013-02-111-2/+5
|
* Merge branch '3-2-sec' into 3-2-stableAaron Patterson2013-02-111-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-sec: bumping version remove ruby-prof Fix issue with attr_protected where malformed input could circumvent protection fixing call to columns hash. run the damn tests when you backport! Bump rack dependency to 1.4.5 Merge pull request #9224 from dylanahsmith/bigdecimal-takes-string Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric Conflicts: Gemfile activerecord/CHANGELOG.md
| * bumping versionAaron Patterson2013-02-101-1/+1
| |
* | Fix the CHANGELOG entry order [ci skip]Rafael Mendonça França2013-01-251-3/+5
| |
* | Make tests for the presence of MiniTest consistent.James Mead2013-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is an inconsistency between the conditional logic in the definition of ActiveSupport::TestCase and the conditional logic in ActiveSupport::Testing::SetupAndTeardown [1]. In some circumstances, it's possible for MiniTest to be defined, but for ActiveSupport::TestCase *not* to have MiniTest::Unit::TestCase or MiniTest::Assertions in its ancestor chain. e.g. in Ruby 1.8 with the minitest gem included in the bundle. In this case, the Test::Unit/MiniTest shim/wrapper is not present and so Test::Unit::TestCase (and therefore ActiveSupport::TestCase) is completely independent of MiniTest::Unit::TestCase. The conditional logic in the definition of ActiveSupport::TestCase does not take this scenario into account, whereas the logic in ActiveSupport::Testing::SetupAndTeardown does take it into account. The changes in this commit are an alternative to the change in [2] which was reverted in [3]. Similar conditional logic exists in ActiveSupport::Testing::Isolation [4], ActiveSupport::Testing::Pending [5], ActiveSupport::Testing::Performance [6], and in their respective tests. I have not addressed these, because I know less about what's going on there, but it would be worth bringing them all into line too. [1] https://github.com/rails/rails/blob/3-2-stable/activesupport/lib/active_support/testing/setup_and_teardown.rb#L13 [2] https://github.com/rails/rails/commit/c3e186ec8dcb2ec26d5d56f3e89123b1350c4a6f [3] https://github.com/rails/rails/commit/267fb61277ac960ad443d239febcb3136a007d24 [4] https://github.com/rails/rails/blob/3-2-stable/activesupport/lib/active_support/testing/isolation.rb#L41 [5] https://github.com/rails/rails/blob/3-2-stable/activesupport/lib/active_support/testing/pending.rb#L14 [6] https://github.com/rails/rails/blob/3-2-stable/activesupport/lib/active_support/testing/performance.rb#L17
* | Test to allow Range including DateTime and DateTime::Infinitygsphanikumar2013-01-131-0/+6
| | | | | | | | Closes #8587
* | Fix DateTime comparison with DateTime::Infinity objectDan Kubb2013-01-132-1/+4
| |
* | Update changelogs with release date [ci skip]Carlos Antonio da Silva2013-01-091-1/+2
| |
* | Merge branch '3-2-sec' into 3-2-secmergeAaron Patterson2013-01-084-16/+58
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * bumping versionAaron Patterson2013-01-081-1/+1
| |
| * CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml.Jeremy Kemper2013-01-083-13/+56
| |
* | Wrap time ranges with timezones, closes #8807Vasiliy Ermolovich2013-01-085-43/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | (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>
* | Merge tag 'v3.2.10' into 3-2-stableMiguel2013-01-031-1/+1
|\| | | | | | | Latest released tag was not fully merged into the stable branch (missed version bumping)
| * bumping version to 3.2.10Aaron Patterson2012-12-231-1/+1
| |
* | Add release date of 3.2.10Rafael Mendonça França2013-01-021-1/+9
| | | | | | | | Fix format and wrong changelog entry
* | Merge branch '3-2-sec' into 3-2-secmergeAaron Patterson2012-12-231-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-sec: CVE-2012-5664 options hashes should only be extracted if there are extra parameters updating changelog updating the changelogs updating the changelog for the CVE Add release date of Rails 3.2.9 to documentation Conflicts: actionmailer/CHANGELOG.md actionpack/CHANGELOG.md activemodel/CHANGELOG.md activerecord/CHANGELOG.md activeresource/CHANGELOG.md activesupport/CHANGELOG.md railties/CHANGELOG.md
| * Add release date of Rails 3.2.9 to documentationclaudiob2012-12-231-1/+1
| | | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md
* | Use 1.8 style hash in json encoding testCarlos Antonio da Silva2012-12-141-1/+1
| |
* | Remove unicode character encoding from ActiveSupport::JSON.encodeBrett Carter2012-12-143-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.9Carlos Antonio da Silva2012-12-112-10/+11
| | | | | | | | | | | | 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-microsecondsJeremy Kemper2012-12-102-1/+4
| | | | | | | | | | | | Increase numeric-timestamp precision to nanoseconds Conflicts: activesupport/lib/active_support/core_ext/time/conversions.rb
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 13:23:09 +0000