Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Adjust tests for differences between Ruby 1.8 and 1.9 | Andrew White | 2016-11-03 | 2 | -10/+2 |
| | | | | | Ruby 1.9 added Hash#select! and return a hash from Hash#select whereas Ruby 1.8 returned an array. | ||||
* | Fix method redefinition warnings in i18n gem | Andrew White | 2016-11-02 | 1 | -0/+4 |
| | | | | | | The i18n gem adds its own copies of deep_merge, except and slice if they haven't been defined so require them early to prevent any method redefinition warnings from appearing. | ||||
* | Fix AS::HWIA#select and #reject on Ruby 2.1.1+ | Andrew White | 2016-11-02 | 1 | -0/+14 |
| | | | | | | In Ruby 2.1.1 and later select and reject return a new instance of Hash rather than the subclass so we need to override them to return an instance of the correct class. | ||||
* | Fix warning with ambiguous *args | Andrew White | 2016-11-02 | 1 | -1/+1 |
| | |||||
* | Fix AS::OrderHash#select and #reject on Ruby 2.1.1+ | Andrew White | 2016-11-02 | 1 | -0/+14 |
| | | | | | | In Ruby 2.1.1 and later select and reject return a new instance of Hash rather than the subclass so we need to override them to return an instance of the correct class. | ||||
* | Ruby 2.0 added LoadError#path | Andrew White | 2016-11-02 | 1 | -6/+8 |
| | |||||
* | Fix File.exists? deprecation warnings in Active Support | Andrew White | 2016-11-02 | 1 | -1/+1 |
| | |||||
* | bumping version | Aaron Patterson | 2016-09-14 | 1 | -1/+1 |
| | |||||
* | bumping version | Aaron Patterson | 2016-08-11 | 1 | -1/+1 |
| | |||||
* | bumping version | Aaron Patterson | 2016-08-10 | 1 | -1/+1 |
| | |||||
* | Preparing for 3.2.22.2 release | Rafael Mendonça França | 2016-02-29 | 1 | -1/+1 |
| | |||||
* | bumping version | Aaron Patterson | 2016-01-25 | 1 | -1/+1 |
| | |||||
* | use secure string comparisons for basic auth username / password | Aaron Patterson | 2016-01-22 | 1 | -0/+27 |
| | | | | | | | | | | | | this will avoid timing attacks against applications that use basic auth. Conflicts: activesupport/lib/active_support/security_utils.rb Conflicts: actionpack/lib/action_controller/metal/http_authentication.rb CVE-2015-7576 | ||||
* | Preparing for 3.2.22 release | Rafael Mendonça França | 2015-06-16 | 1 | -1/+1 |
| | |||||
* | enforce a depth limit on XML documents | Aaron Patterson | 2015-06-16 | 3 | -10/+15 |
| | | | | | | | | | | XML documents that are too deep can cause an stack overflow, which in turn will cause a potential DoS attack. CVE-2015-3227 Conflicts: activesupport/lib/active_support/xml_mini.rb | ||||
* | Fix ruby 2.2 comparable warnings | Joey Geiger | 2015-01-29 | 1 | -0/+1 |
| | | | | | Check for correct value type in activerecord/fixtures.rb Check that zone can respond to expected values to make the comparison. | ||||
* | Remove hard dependency on test-unit | Rafael Mendonça França | 2015-01-07 | 2 | -2/+11 |
| | | | | | Instead show a error message asking users to add the gem to their Gemfile if test-unit could not be loaded. | ||||
* | use self.method syntax to resolve circular argument issues | Aman Gupta | 2015-01-02 | 1 | -1/+1 |
| | |||||
* | Fix `singleton_class?` | Vipul A M | 2015-01-02 | 1 | -3/+5 |
| | | | | | | | | Due to changes from http://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/39628 current `singleton_class?` implementation fails. Changed based on reference from http://bugs.ruby-lang.org/issues/7609 Conflicts: activesupport/lib/active_support/core_ext/class/attribute.rb | ||||
* | fix yaml compat on ruby 2.2 | Aman Gupta | 2015-01-02 | 1 | -1/+3 |
| | |||||
* | Check `respond_to` before delegation due to: ↵ | Aaron Patterson | 2014-12-22 | 1 | -1/+7 |
| | | | | https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314 | ||||
* | fix ruby 2.2 warning: circular argument reference | Aman Gupta | 2014-12-22 | 1 | -1/+1 |
| | |||||
* | bumping version for relesase | Aaron Patterson | 2014-11-16 | 1 | -1/+1 |
| | |||||
* | bumping version to 3.2.20 | Aaron Patterson | 2014-10-29 | 1 | -1/+1 |
| | |||||
* | Preparing for 3.2.19 release | Rafael Mendonça França | 2014-07-02 | 1 | -1/+1 |
| | |||||
* | Make sure Active Support configurations are applied correctly | Rafael Mendonça França | 2014-06-26 | 1 | -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 Iguaran | 2014-06-18 | 1 | -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 Zambre | 2014-06-18 | 1 | -1/+1 |
| | | | File.exists? is a deprecated name, use File.exist? | ||||
* | Preparing for 3.2.18 release | Rafael Mendonça França | 2014-05-06 | 1 | -1/+1 |
| | |||||
* | Preparing for 3.2.17 release | Rafael Mendonça França | 2014-02-18 | 1 | -1/+1 |
| | |||||
* | updating the changelog | Aaron Patterson | 2013-12-02 | 1 | -1/+1 |
| | |||||
* | bumping to 3.2.15 | Aaron Patterson | 2013-10-15 | 1 | -1/+1 |
| | |||||
* | Merge branch '3-2-15' into 3-2-sec | Aaron Patterson | 2013-10-15 | 1 | -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 rc3 | Aaron Patterson | 2013-10-11 | 1 | -1/+1 |
| | | |||||
| * | bumping to rc2 | Aaron Patterson | 2013-10-04 | 1 | -1/+1 |
| | | |||||
| * | bumping version to 3.2.15.rc1 | Aaron Patterson | 2013-10-03 | 1 | -2/+2 |
| | | |||||
* | | Remove the use of String#% when formatting durations in log messages | Michael Koziarski | 2013-09-30 | 1 | -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-cleanup | Rafael Mendonça França | 2013-09-12 | 1 | -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_missing | Eugene Kalenkovich | 2013-08-18 | 1 | -2/+8 |
| | |||||
* | Merge branch '3-2-14' into 3-2-stable | Rafael Mendonça França | 2013-07-22 | 1 | -1/+1 |
|\ | |||||
| * | Preparing for 3.2.14 release | Rafael Mendonça França | 2013-07-22 | 1 | -1/+1 |
| | | |||||
| * | Preparing for 3.2.14.rc2 release | Rafael Mendonça França | 2013-07-16 | 1 | -1/+1 |
| | | |||||
| * | Preparing for 3.2.14.rc1 release | Rafael Mendonça França | 2013-07-12 | 1 | -2/+2 |
| | | |||||
* | | Add respond_to_missing? for TaggedLogging which is needed if another log ↵ | Wolfram Arnold | 2013-07-17 | 1 | -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 superclass | Andrew White | 2013-07-10 | 1 | -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 compatibility | Andrew White | 2013-07-09 | 1 | -1/+1 |
| | |||||
* | Retain offset and fraction when using Time.at_with_coercion | Andrew White | 2013-07-09 | 1 | -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 variable | Rafael Mendonça França | 2013-07-06 | 1 | -1/+1 |
| | |||||
* | Incorrectly providing program name the same as log message even when block ↵ | Carson Reinke | 2013-07-01 | 1 | -1/+8 |
| | | | | is not provided. | ||||
* | Backport rails/rails-perftest#2 to fix rake test:benchmark | Yves Senn | 2013-06-27 | 4 | -4/+4 |
| |