Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Branch: 3-2-stable
Commits on Jun 18, 2015
  1. @rafaelfranca

    Merge pull request #20629 from moklett/patch-1

    rafaelfranca authored
    Fix typo in version number
  2. @moklett

    Fix typo in version number

    moklett authored
    Fixes a simple copy-and-paste mistake by bumping the patch version number in the CHANGELOG.
Commits on Jun 16, 2015
  1. @rafaelfranca
  2. @rafaelfranca
  3. @rafaelfranca
  4. @tenderlove @rafaelfranca

    enforce a depth limit on XML documents

    tenderlove authored rafaelfranca committed
    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
Commits on Jan 29, 2015
  1. @rafaelfranca

    Merge pull request #18718 from jgeiger/fix_ruby_2_2_comparable_warnings

    rafaelfranca authored
    Fix ruby 2.2 comparable warnings
  2. @jgeiger

    Fix ruby 2.2 comparable warnings

    jgeiger authored
    Check for correct value type in activerecord/fixtures.rb
    Check that zone can respond to expected values to make the comparison.
Commits on Jan 7, 2015
  1. @rafaelfranca
  2. @rafaelfranca
  3. @rafaelfranca

    Remove hard dependency on test-unit

    rafaelfranca authored
    Instead show a error message asking users to add the gem to their
    Gemfile if test-unit could not be loaded.
  4. @rafaelfranca

    Merge pull request #18306 from tmm1/rm-3-2-with-ruby-2-1-plus

    rafaelfranca authored
    3-2-stable: ruby 2.2 compatibility
Commits on Jan 5, 2015
  1. @tmm1

    add parens to fix warning

    tmm1 authored
Commits on Jan 3, 2015
  1. @tmm1
  2. @tmm1
  3. @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
  4. @tmm1

    parse stringified mime type

    tmm1 authored
  5. @tmm1

    fix yaml compat on ruby 2.2

    tmm1 authored
  6. @tmm1

    fix regex case

    tmm1 authored
  7. @tmm1

    restore I18n.locale after test

    tmm1 authored
  8. @tmm1
  9. @kou @tmm1

    switch to minitest and test-unit compatible assert_raise syntax

    kou authored tmm1 committed
  10. @tmm1
  11. @tmm1

    try using newer test-unit gem

    tmm1 authored
Commits on Jan 2, 2015
  1. @hsbt @tmm1

    added dependency of test-unit into activesupport

    hsbt authored tmm1 committed
  2. @rafaelfranca
  3. @rafaelfranca

    Merge pull request #18160 from tmm1/3-2-ruby-2-2

    rafaelfranca authored
    3-2-stable: add ruby 2.2 compatibility
  4. @rafaelfranca
Commits on Dec 23, 2014
  1. @tenderlove @tmm1
  2. @tmm1
Commits on Nov 16, 2014
  1. @tenderlove
  2. @tenderlove

    correctly escape backslashes in request path globs

    tenderlove authored
    Conflicts:
    	actionpack/lib/action_dispatch/middleware/static.rb
    
    make sure that unreadable files are also not leaked
    
    CVE-2014-7829
Commits on Oct 30, 2014
  1. @tenderlove

    Merge branch '3.2.20' into 3-2-stable

    tenderlove authored
    * 3.2.20:
      bumping version to 3.2.20
      FileHandler should not be called for files outside the root
Commits on Oct 29, 2014
  1. @tenderlove

    bumping version to 3.2.20

    tenderlove authored
  2. @tenderlove

    FileHandler should not be called for files outside the root

    tenderlove authored
    FileHandler#matches? should return false for files that are outside the
    "root" path.
    
    Conflicts:
    	actionpack/lib/action_dispatch/middleware/static.rb
    
    Conflicts:
    	actionpack/lib/action_dispatch/middleware/static.rb
    	actionpack/test/dispatch/static_test.rb
Something went wrong with that request. Please try again.