Permalink
Commits on Nov 18, 2011
  1. Preparing for 3.0.11 release

    jonleighton committed Nov 18, 2011
Commits on Nov 17, 2011
  1. removing stubs. 1.9.3 implements Date.today in C so mocking the retur…

    …n value of Time.now does nothing
    tenderlove committed with jonleighton Mar 7, 2011
  2. _html translation should escape interpolated arguments

    Conflicts:
    
    	actionpack/CHANGELOG.md
    lest committed with jonleighton Nov 17, 2011
  3. Implement a workaround for a bug in ruby-1.9.3p0.

    The bug is that an error would be raised while attempting to convert a
    template from one encoding to another.
    
    Please see http://redmine.ruby-lang.org/issues/5564 for more details.
    
    The workaround is to load all conversions into memory ahead of time,
    and will only happen if the ruby version is *exactly* 1.9.3p0. The
    hope is obviously that the underlying problem will be resolved in
    the next patchlevel release of 1.9.3.
    
    Conflicts:
    
    	actionpack/CHANGELOG.md
    jonleighton committed Nov 6, 2011
  4. Use broken YAML that will fail with Syck as well as Psych. Fixes test…

    …_broken_yaml_exception in fixtures_test.rb on Ruby 1.8.7.
    
    Cherry-pick from 3-1-stable: b8d4692
    
    Conflicts:
    
    	activerecord/test/cases/fixtures_test.rb
    jonleighton committed Sep 6, 2011
  5. Merge pull request #3655 from arunagw/mysql_bump_3-0-stable

    Mysql bump 3 0 stable
    josevalim committed Nov 17, 2011
  6. Mysql2 version bump!

    I saw one bug fixed here 
    
    brianmario/mysql2@e60599b
    arunagw committed Nov 17, 2011
Commits on Nov 16, 2011
  1. Revert "Merge pull request #2122 from dyba/3-0-stable"

    This reverts commit b81c3f7, reversing
    changes made to 6122924.
    tenderlove committed Nov 16, 2011
  2. Merge pull request #2122 from dyba/3-0-stable

    Issue #1866: Changed Commands module to RailsCommands.
    tenderlove committed Nov 16, 2011
  3. Merge pull request #3646 from mhuffnagle/3-0-stable

    Fix for relative_url_root= missing parameter (issue 3645)
    wycats committed Nov 16, 2011
  4. Added a missing parameter to relative_url_root= that was causing an A…

    …rgumentError: wrong number of arguments (1 for 0) to be thrown at actionpack-3.0.10/lib/action_controller/railtie.rb:54.
    mhuffnagle committed Nov 16, 2011
Commits on Nov 1, 2011
  1. Remove a circular require in AS deprecations. This is safe as AS depr…

    …ecations is autoloaded as needed.
    joshk committed with tenderlove May 12, 2011
Commits on Oct 17, 2011
  1. Merge pull request #3330 from arunagw/ignore_sqlnet_3-0-stable

    Ignore sqlnet 3 0 stable
    vijaydev committed Oct 17, 2011
Commits on Oct 14, 2011
Commits on Oct 6, 2011
  1. Merge pull request #3233 from benolee/fix_spelling_in_doc_app_rake_task

    Fix spelling in doc:app rake task
    vijaydev committed Oct 6, 2011
Commits on Oct 5, 2011
  1. Fix spelling in doc:app rake task

    Ben Holley committed Oct 5, 2011
Commits on Oct 3, 2011
  1. Merge pull request #2801 from jeremyevans/patch-1

    Fix obviously breakage of Time.=== for Time subclasses
    jeremy committed Oct 3, 2011
Commits on Sep 27, 2011
Commits on Sep 12, 2011
Commits on Sep 11, 2011
  1. prevent errors when passing a frozen string as a param to ActionContr…

    …oller::TestCase#process
    
    since ActionDispatch::Http::Parameters#encode_params will force encoding on all params strings (when using an encoding aware Ruby), dup all strings passed into process.  This prevents modification of params passed in and, more importantly, doesn't barf when a frozen string is passed
    thanks and high fives to kinsteronline
    misfo committed with jeremy Feb 8, 2011
Commits on Sep 10, 2011
  1. fix assert message

    vijaydev committed Sep 10, 2011
Commits on Sep 9, 2011
Commits on Sep 8, 2011
  1. Merge pull request #2682 from guilleiguaran/3-0-stable-changelogs

    Update changelogs (3-0-stable)
    vijaydev committed Sep 8, 2011
  2. Merge pull request #2939 from akaspick/url_for_fix_3_0

    fix url_for when passing a hash to prevent unwanted additional values being added to the hash (backport to 3-0-stable)
    josevalim committed Sep 8, 2011
  3. when calling url_for with a hash, additional (likely unwanted) values…

    … (such as :host) would be returned in the hash... calling #dup on the hash prevents this
    akaspick committed Aug 11, 2011
Commits on Sep 7, 2011
  1. Update changelog for 'Backport "ActiveRecord::Persistence#touch shoul…

    …d not use default_scope" (pull request #1519)'
    porras committed with jonleighton Sep 7, 2011
  2. Merge pull request #2918 from akaspick/assert_select_email_fix_3_0

    assert_select_email fix for 3-0-stable
    jonleighton committed Sep 7, 2011