aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
Commit message (Collapse)AuthorAgeFilesLines
* Make sure Active Support configurations are applied correctlyRafael Mendonça França2014-06-261-0/+7
| | | | | | | Before this patch configuration set using config.active_support would not be set. Closes #15364
* Revert "Merge pull request #15794 from vishalzambre/patch-1"Guillermo Iguaran2014-06-181-1/+1
| | | | | | | This reverts commit 6d800a909e24465ca6f3fa5206222fa7d78967f6, reversing changes made to 6a051299f98ee43864326c6c0a4f7d169d22b3f8. We don't apply non-security fixes to 3-2-stable branch!!!
* File.exists? is a deprecated name, use File.exist?Vishal Zambre2014-06-181-1/+1
| | | File.exists? is a deprecated name, use File.exist?
* Preparing for 3.2.18 releaseRafael Mendonça França2014-05-061-1/+1
|
* Preparing for 3.2.17 releaseRafael Mendonça França2014-02-181-1/+1
|
* updating the changelogAaron Patterson2013-12-021-1/+1
|
* bumping to 3.2.15Aaron Patterson2013-10-151-1/+1
|
* Merge branch '3-2-15' into 3-2-secAaron Patterson2013-10-151-2/+2
|\ | | | | | | | | | | | | | | | | | | | | * 3-2-15: bumping to rc3 Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build" Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_target" bumping to rc2 Merge pull request #12443 from arthurnn/add_inverse_of_add_target bumping version to 3.2.15.rc1 Fix STI scopes using benolee's suggestion. Fixes #11939
| * bumping to rc3Aaron Patterson2013-10-111-1/+1
| |
| * bumping to rc2Aaron Patterson2013-10-041-1/+1
| |
| * bumping version to 3.2.15.rc1Aaron Patterson2013-10-031-2/+2
| |
* | Remove the use of String#% when formatting durations in log messagesMichael Koziarski2013-09-301-0/+4
|/ | | | | This avoids potential format string vulnerabilities where user-provided data is interpolated into the log message before String#% is called.
* Merge pull request #12196 from h-lame/fix-activesupport-cache-filestore-cleanupRafael Mendonça França2013-09-121-1/+2
| | | | | | | Fix FileStore#cleanup to no longer rely on missing each_key method Conflicts: activesupport/CHANGELOG.md activesupport/test/caching_test.rb
* Fix 1.8.7 incompatible respond_to_missingEugene Kalenkovich2013-08-181-2/+8
|
* Merge branch '3-2-14' into 3-2-stableRafael Mendonça França2013-07-221-1/+1
|\
| * Preparing for 3.2.14 releaseRafael Mendonça França2013-07-221-1/+1
| |
| * Preparing for 3.2.14.rc2 releaseRafael Mendonça França2013-07-161-1/+1
| |
| * Preparing for 3.2.14.rc1 releaseRafael Mendonça França2013-07-121-2/+2
| |
* | Add respond_to_missing? for TaggedLogging which is needed if another log ↵Wolfram Arnold2013-07-171-0/+4
|/ | | | | | abstracter wraps a TaggedLogging instance. It's also best practice when overriding method_missing.
* Add missing require so that DateTime has the right superclassAndrew White2013-07-101-0/+1
| | | | | | | | | | If the DateTime core extensions were loaded before the Date core extensions then you would get a superclass mismatch as DateTime hasn't been defined yet so it gets set to Object by the acts_like core extension. Fixes #11206 (cherry picked from commit 78f7d5b652000dbb1a11d34fe370c3fa82de840c)
* Return local time for backwards compatibilityAndrew White2013-07-091-1/+1
|
* Retain offset and fraction when using Time.at_with_coercionAndrew White2013-07-091-3/+8
| | | | | | | | | | | | | | | | The standard Ruby behavior for Time.at is to return the same type of time when passing an instance of Time as a single argument. Since the an ActiveSupport::TimeWithZone instance may be a different timezone than the system timezone and DateTime just understands offsets the best we can do is to return an instance of Time with the correct offset. It also maintains the correct fractional second value as well. Fixes #11350. Backports: 484253515c0e05760541dc48946361185c9e6904 1b3873730b96035a238dbff7627bd5942e6dc4e7
* Remove warning of assigned but unused variableRafael Mendonça França2013-07-061-1/+1
|
* Incorrectly providing program name the same as log message even when block ↵Carson Reinke2013-07-011-1/+8
| | | | 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-081-0/+12
| | | | | | | 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.
* Revert "Remove unicode character encoding from ActiveSupport::JSON.encode"Rafael Mendonça França2013-05-081-1/+7
| | | | | | | | | | | | 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.
* Merge branch '3-2-13' into 3-2-stableAaron Patterson2013-03-182-1/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-151-0/+6
| | | | | | | | | | 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
| |
* | Fix `ActiveSupport::TimeZone.parse` when time is a local DST jumpAndrew White2013-03-131-6/+16
|/ | | | | | | | | | | | | 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 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.
* search private and protected methods for convert_keyAaron Patterson2013-02-243-4/+3
|
* Add in missing requiresPrem Sichanugrist2013-02-241-0/+2
|
* 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
| |
* | 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
* | Fix DateTime comparison with DateTime::Infinity objectDan Kubb2013-01-131-1/+1
| |
* | Merge branch '3-2-sec' into 3-2-secmergeAaron Patterson2013-01-082-8/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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-081-7/+25
| |
* | Wrap time ranges with timezones, closes #8807Vasiliy Ermolovich2013-01-082-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | (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
| |
* | Remove unicode character encoding from ActiveSupport::JSON.encodeBrett Carter2012-12-141-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-111-1/+2
| | | | | | | | | | | | 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-101-0/+1
| | | | | | | | | | | | 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-09 20:34:25 +0000