Permalink
Commits on Mar 18, 2013
  1. bumping to 3.2.13

    tenderlove committed Mar 18, 2013
Commits on Mar 16, 2013
  1. fix protocol checking in sanitization [CVE-2013-1857]

    Conflicts:
    	actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
    tenderlove committed Mar 15, 2013
  2. JDOM XXE Protection [CVE-2013-1856]

    Conflicts:
    	activesupport/test/xml_mini/jdom_engine_test.rb
    benmmurphy committed with tenderlove Feb 8, 2013
Commits on Mar 12, 2013
  1. Merge pull request #9616 from exviva/multiple_select_name_double_squa…

    …re_brackets
    
    Fix incorrectly appended square brackets to a multiple select box
    
    Before:
    
        select(:category, [], {}, {:multiple => true, :name => "post[category][]"})
        # => <select name="post[category][][]" ...>
    
    After:
    
        select(:category, [], {}, {:multiple => true, :name => "post[category][]"})
        # => <select name="post[category][]" ...>
    
    Conflicts:
    	actionpack/CHANGELOG.md
    	actionpack/lib/action_view/helpers/tags/base.rb
    	actionpack/test/template/form_options_helper_test.rb
    carlosantoniodasilva committed Mar 9, 2013
Commits on Mar 6, 2013
  1. bumping to rc2

    tenderlove committed Mar 6, 2013
Commits on Mar 5, 2013
  1. Revert "Merge pull request #8209 from senny/backport_8176"

    This reverts commit 7240202, reversing
    changes made to e4e2bcc.
    
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/relation/calculations.rb
    	activerecord/test/cases/calculations_test.rb
    tenderlove committed Mar 5, 2013
  2. Freeze columns only once per Result

    Conflicts:
    	activerecord/lib/active_record/result.rb
    spastorino committed with tenderlove Sep 20, 2012
Commits on Feb 27, 2013
  1. Tighten up AS.gemspec.

    Apparently 0.6.2 has a call to force_encoding, which is not around
    in 1.8.7.
    steveklabnik committed Feb 27, 2013
  2. CHANGELOG entry for ee291b9.

    Since we released it, it should go in the CHANGELOG.
    steveklabnik committed Feb 27, 2013
  3. Revert "Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-nu…

    …meric"
    
    This reverts commit 921a296.
    steveklabnik committed Feb 27, 2013
Commits on Feb 26, 2013
  1. Merge pull request #9430 from authorNari/backport-7072-to-3-2-stable

    Backported #7072 to 3-2-stable. Use database value for uniqueness validation scope
    carlosantoniodasilva committed Feb 26, 2013
Commits on Feb 25, 2013
  1. Merge pull request #9408 from mikeycgto/origin/3-2-stable

    Update RUBY_VERSION check for performance testing to handle 2.0.0
    rafaelfranca committed Feb 25, 2013
Commits on Feb 24, 2013
  1. Merge pull request #9406 from rails/3-2-stable-ruby-2

    Rails 3.2.x is now compatible with Ruby 2.0.0
    rafaelfranca committed Feb 24, 2013
  2. added marshal_load and marshal_dump for ProxyTestResult. Behavior of …

    …method_missing with Marshal.dump and Marshal.load is changing in ruby 2.0.0 later.
    hsbt committed with sikachu Dec 29, 2012
  3. Do not redirect cache logger to /dev/null in test

    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.)
    sikachu committed Feb 22, 2013
  4. Ruby 2 compat. Hash[] now raises on bad elements rather than ignoring…

    … them. No sense over-testing this MRI-specific behavior. See ruby/ruby@8d6add9
    jeremy committed with sikachu Oct 7, 2012
  5. Check for `method_missing` in public and protected

    Ruby 2.0 changed the behavior of `respond_to?` without argument to
    return only search for public method. We actually want to perform the
    action only if `method_missing` is either in public or protected.
    sikachu committed Feb 22, 2013
  6. Ruby 2 compat. CGI.escapeHTML has changed the way it escapes apostrop…

    …hes a few times, so fix up the test to work with however it chooses to escape.
    jeremy committed with sikachu Oct 7, 2012
  7. Ruby 2.0.0 defaults source encoding to utf-8 so we need to specifical…

    …ly tag this file with us-ascii
    tenderlove committed with sikachu Nov 13, 2012
  8. Define #inspect instead of #to_s

    Ruby 2.0 Object#inspect does not call #to_s by default anymore.
    sikachu committed Feb 22, 2013
  9. `name` should be public.

    tenderlove committed with sikachu May 24, 2012
  10. Add in missing requires

    sikachu committed Feb 21, 2013