Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jan 3, 2015
  1. @vipulnsward @tmm1

    Fix `singleton_class?`

    vipulnsward authored tmm1 committed
    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
  2. @tmm1

    fix yaml compat on ruby 2.2

    tmm1 authored
Commits on Dec 23, 2014
  1. @tenderlove @tmm1
Commits on Jul 10, 2013
  1. @pixeltrix

    Add missing require so that DateTime has the right superclass

    pixeltrix authored
    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 78f7d5b)
Commits on Jul 9, 2013
  1. @pixeltrix
  2. @pixeltrix

    Retain offset and fraction when using Time.at_with_coercion

    pixeltrix authored
    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:
    4842535
    1b38737
Commits on Jul 6, 2013
  1. @rafaelfranca
Commits on Jun 8, 2013
  1. @pixeltrix

    Override Time.at to work with Time-like values

    pixeltrix authored
    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.
Commits on Feb 24, 2013
  1. @tenderlove @sikachu

    search private and protected methods for convert_key

    tenderlove authored sikachu committed
  2. @sikachu

    Add in missing requires

    sikachu authored
Commits on Jan 14, 2013
  1. @dkubb
Commits on Jan 8, 2013
  1. @tenderlove

    Merge branch '3-2-sec' into 3-2-secmerge

    tenderlove authored
    * 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
  2. @jeremy @tenderlove
  3. @nashby @pixeltrix

    Wrap time ranges with timezones, closes #8807

    nashby authored pixeltrix committed
    (cherry picked from commit e2e5136)
    (cherry picked from commit dcdde7d)
    
    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>
Commits on Dec 11, 2012
  1. @carlosantoniodasilva

    Add :nsec format only for Ruby 1.9

    carlosantoniodasilva authored
    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.
Commits on Dec 10, 2012
  1. @jeremy @rafaelfranca

    Merge pull request #6376 from jgaskins/timestamp-microseconds

    jeremy authored rafaelfranca committed
    Increase numeric-timestamp precision to nanoseconds
    Conflicts:
    	activesupport/lib/active_support/core_ext/time/conversions.rb
Commits on Dec 4, 2012
  1. @carlosantoniodasilva

    Use send in Time marshal extensions since the methods are now private

    carlosantoniodasilva authored
    See ruby/ruby@9c1b316
    
    All Active Support tests pass in 2.0.0preview2 after this change.
    Closes #8409
Commits on Nov 8, 2012
  1. @fxn @carlosantoniodasilva

    Merge pull request #8027 from daenney/master

    fxn authored carlosantoniodasilva committed
    Atomic.rb assumes it may chown/chmod a file but doesn't handle the EPERM error.
    
    Conflicts:
    	activesupport/CHANGELOG.md
    	guides/source/active_support_core_extensions.md
Commits on Oct 24, 2012
  1. @GRoguelon
Commits on Aug 2, 2012
  1. @rafaelfranca
  2. @spastorino @rafaelfranca

    html_escape should escape single quotes

    spastorino authored rafaelfranca committed
    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
Commits on Jul 14, 2012
  1. @fxn

    adds a missing require [fixes #6896]

    fxn authored
    This file uses Time.zone, which is defined in
    active_support/core_ext/time/zones.rb.
Commits on Jun 25, 2012
  1. @carlosantoniodasilva

    Merge pull request #6857 from rsutphin/as_core_ext_time_missing_require

    carlosantoniodasilva authored
    Missing require breaks Time.=== when selectively loading ActiveSupport core_exts in 3.2.4+
Commits on May 20, 2012
  1. @drogus
Commits on May 15, 2012
  1. @frodsan
Commits on May 13, 2012
  1. @frodsan

    adding examples and docs

    frodsan authored
Commits on May 9, 2012
  1. @frodsan
Commits on May 8, 2012
  1. @frodsan

    removing docs duplication

    frodsan authored
  2. @vijaydev

    Merge pull request #6211 from frodsan/docs_attr_accessor_32stable

    vijaydev authored
    Adding docs to attribute accessor methods.
  3. @frodsan
Commits on May 4, 2012
  1. @mjtko
Commits on Apr 28, 2012
  1. @oscardelben @arunagw

    Remove circular require of time/zones

    oscardelben authored arunagw committed
Commits on Apr 15, 2012
  1. @drogus

    Add missing require in Active Support time zones (fixes #5854)

    drogus authored
    I also removed the other require as it's already present in
    `activesupport/core_ext/time/calculations`
Commits on Apr 10, 2012
  1. @tenderlove @arunagw

    probably should require the objects we monkey patch.

    tenderlove authored arunagw committed
  2. @tenderlove @arunagw

    bigdecimal can be duped on Ruby 2.0

    tenderlove authored arunagw committed
    Conflicts:
    
    	activesupport/test/core_ext/duplicable_test.rb
Something went wrong with that request. Please try again.