Skip to content
Commits on Feb 22, 2012
  1. @tenderlove

    updating RAILS_VERSION

    tenderlove committed Feb 22, 2012
  2. @jonleighton
Commits on Jan 24, 2012
  1. @tenderlove

    Merge pull request #4514 from brainopia/update_timezone_offets

    Update time zone offset information
    tenderlove committed Jan 24, 2012
Commits on Jan 7, 2012
  1. @josevalim

    Merge pull request #4372 from arunagw/fixed_failing_test

    Fixed failing test
    josevalim committed Jan 6, 2012
  2. @arunagw

    Fixed failing test for ruby-1.8.7-p357

    See #4292
    arunagw committed Jan 7, 2012
Commits on Dec 31, 2011
  1. @josevalim

    Merge pull request #4246 from amatsuda/hashdos_30

    bump up rack version to the one that includes the Hash DoS fix
    josevalim committed Dec 31, 2011
  2. @amatsuda
Commits on Dec 20, 2011
  1. @spastorino

    Merge pull request #4031 from arunagw/3-0-stable

    3 0 stable travis sync
    spastorino committed Dec 20, 2011
Commits on Dec 19, 2011
  1. @jonleighton @arunagw
Commits on Dec 18, 2011
  1. @jonleighton
Commits on Dec 17, 2011
  1. @josevalim

    Update .travis.yml

    josevalim committed Dec 17, 2011
  2. @spastorino

    Sync .travis.yml with master

    spastorino committed Dec 17, 2011
Commits on Dec 3, 2011
  1. @jonleighton

    Enable postgres on the CI ❤️ 🍺

    Conflicts:
    
    	Gemfile
    jonleighton committed Dec 3, 2011
  2. @tenderlove

    Merge pull request #3846 from sumbach/backport-load-and-require-fixes…

    …-to-3-0
    
    Backport load and require fixes to 3 0
    tenderlove committed Dec 3, 2011
  3. @tenderlove @sumbach
  4. @tenderlove @sumbach
  5. @sumbach

    Simplify load and require tests

    - These tests don't use autoloading so there's no need to add anything to autoload_paths
    sumbach committed Dec 3, 2011
  6. @sumbach
  7. @sumbach
  8. @sumbach

    Test return value of ActiveSupport::Dependencies::Loadable#require

    - Add tests to protect from regressions in require's return value behavior
    - See a10606c (require needs to return true or false) for the original bug fix
    sumbach committed Dec 3, 2011
Commits on Nov 30, 2011
  1. @josevalim

    Merge pull request #3805 from arunagw/active_model_patch_3-0-stable

    Active model patch 3 0 stable
    josevalim committed Nov 30, 2011
  2. @arunagw

    ActiveModel confirmation validator fix fixes #1152

    If you have an ActiveModel class that has a 
    method email_address_confirmation. 
    This method is being overwritten by the 
    method defined in the Confirmation validator.
    arunagw committed Nov 30, 2011
Commits on Nov 19, 2011
  1. @jonleighton

    Don't html-escape the :count option to translate if it's a Numeric. F…

    …ixes #3685.
    
    Conflicts:
    
    	actionpack/CHANGELOG.md
    
    Conflicts:
    
    	actionpack/CHANGELOG.md
    jonleighton committed Nov 19, 2011
Commits on Nov 18, 2011
  1. @jonleighton

    Preparing for 3.0.11 release

    jonleighton committed Nov 18, 2011
Commits on Nov 17, 2011
  1. @tenderlove @jonleighton
  2. @tenderlove @jonleighton

    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
  3. @lest @jonleighton

    _html translation should escape interpolated arguments

    Conflicts:
    
    	actionpack/CHANGELOG.md
    lest committed with jonleighton Nov 17, 2011
  4. @jonleighton

    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
  5. @jonleighton

    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
  6. @josevalim

    Merge pull request #3655 from arunagw/mysql_bump_3-0-stable

    Mysql bump 3 0 stable
    josevalim committed Nov 17, 2011
  7. @arunagw

    Mysql2 version bump!

    I saw one bug fixed here 
    
    brianmario/mysql2@e60599b
    arunagw committed Nov 17, 2011
Commits on Nov 16, 2011
  1. @tenderlove

    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. @tenderlove

    Merge pull request #2122 from dyba/3-0-stable

    Issue #1866: Changed Commands module to RailsCommands.
    tenderlove committed Nov 16, 2011
  3. @wycats

    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 15, 2011
Something went wrong with that request. Please try again.