ConnectionPool.checkout needs to be restructured to take account of ruby's "non-blocking" strategy for mutex ConditionVariables #5422

Closed
wants to merge 482 commits into
from
This pull request is big! We’re only showing the most recent 250 commits.
Commits on Jan 20, 2012
  1. @jonleighton

    Fix another race condition.

    jonleighton committed Jan 20, 2012
    From 2c667f6.
    
    Thanks @pwnall for the heads-up.
    
    Conflicts:
    
    	activerecord/lib/active_record/core.rb
Commits on Jan 21, 2012
  1. @vijaydev
  2. @kennyj
  3. @josevalim

    Merge pull request #4582 from kennyj/fix_4580

    josevalim committed Jan 21, 2012
    Fix  GH #4580. Rails 3.2: uninitialized constant ActiveSupport::TaggedLogging::ERROR
  4. @waseem

    Remove deprecation warning from console output when running

    waseem committed Jan 21, 2012
    activesupport tests.
  5. @josevalim

    Merge pull request #4586 from waseem/assert_with_no_deprecation_warnings

    josevalim committed Jan 21, 2012
    Assert with no deprecation warnings activesupport tests.
Commits on Jan 22, 2012
  1. @jviney @josevalim

    Fix `$rails_rake_task` global variable warning without replacing the …

    jviney committed with josevalim Jan 21, 2012
    …value of $rails_rake_task if it is already set.
    
    Fixes #4591.
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
  2. @carlosantoniodasilva
  3. @iHiD

    Allow form.select to accept ranges.

    iHiD committed Jan 22, 2012
  4. @josevalim

    Merge pull request #4604 from ihid/3-2-stable

    josevalim committed Jan 22, 2012
    3-2-stable: Fixed regression - unable to use a range as choices for form.select.
  5. @josevalim

    Support decimal{1,2} and decimal{1-2} and decimal{1.2} so it works fi…

    josevalim committed Jan 22, 2012
    …ne with bash, zsh, etc, closes #4602
Commits on Jan 23, 2012
  1. @jviney

    The deprecated ActiveSupport::Base64.decode64 method should call ::Ba…

    jviney committed Jan 23, 2012
    …se64.decode64 not ::Base64.encode64
  2. @vijaydev

    Merge pull request #4611 from jviney/3-2-stable

    vijaydev committed Jan 23, 2012
    Fix ActiveSupport::Base64.decode64
  3. @vijaydev

    test base64 encode and decode

    vijaydev committed Jan 23, 2012
  4. @josevalim

    Merge pull request #4601 from carlosantoniodasilva/patch-1

    josevalim committed Jan 23, 2012
    Add missing require to Array#wrap in generators action methods
Commits on Jan 24, 2012
  1. @tenderlove
  2. @tenderlove
  3. @kennyj @josevalim

    Fix GH #4344. A defined callback in extended module is called too.

    kennyj committed with josevalim Jan 21, 2012
    Conflicts:
    
    	activesupport/test/callbacks_test.rb
  4. @indrekj @rafaelfranca

    Add failing test for date_select

    indrekj committed with rafaelfranca Jan 20, 2012
    date_select does not work when day is discarded, include blank option is
    enabled and struct date itself is nil.
  5. @indrekj @rafaelfranca
  6. datetime_select should work with -/+ infinity dates

    Joe Van Dyk committed Jan 24, 2012
  7. @rafaelfranca
  8. @tenderlove

    Merge pull request #4514 from brainopia/update_timezone_offets

    tenderlove committed Jan 24, 2012
    Update time zone offset information
  9. @josevalim

    Merge pull request #4641 from rafaelfranca/date_select-fix-3-2

    josevalim committed Jan 24, 2012
    date_select fixes [3-2-stable]
  10. @rafaelfranca
  11. @josevalim

    Merge pull request #4643 from rafaelfranca/3-2-stable

    josevalim committed Jan 24, 2012
    Remove unused variables to avoid warnings
  12. @tenderlove

    Merge pull request #4639 from joevandyk/datetime-infinity-select-fix

    tenderlove committed Jan 24, 2012
    datetime_select fix for dates of -infinity and +infinity
Commits on Jan 25, 2012
  1. @pwim

    allow requiring of 'active_model/naming'

    pwim committed Jan 25, 2012
    Requiring 'active_model/naming' will raise an uninitialized constant
    ActiveSupport::Deprecation exception because the module core extension
    doesn't require 'active_support/deprecation'. This require cannot be
    added to the core extension because of circular dependency issues.
  2. @josevalim

    Merge pull request #4654 from pwim/explicit-deprecation-require

    josevalim committed Jan 25, 2012
    Explicit deprecation require
  3. @pwim

    Test for unicode path support

    pwim committed Jan 25, 2012
    This is currently broken due to a bug in journey.
  4. @tenderlove

    Merge pull request #4658 from pwim/unicode-paths

    tenderlove committed Jan 25, 2012
    Test for unicode path support
  5. @damln @vijaydev

    example bracket error

    damln committed with vijaydev Jan 23, 2012
  6. @rohit @vijaydev

    remove extra 'the'

    rohit committed with vijaydev Jan 25, 2012
  7. @carlosantoniodasilva

    Fix custom validation methods section in AR validations and callbacks…

    carlosantoniodasilva committed Jan 25, 2012
    … guide
    
    The methods validate_on_create and validate_on_update are not available
    anymore in Rails, this removes them from the guide and adds an example
    on how to use validate with the :on option.
  8. @carlosantoniodasilva

    Change ActiveRecord::Errors to ActiveModel::Errors in guides

    carlosantoniodasilva committed Jan 25, 2012
    Use ActiveModel::Errors in inflection example docs as well.
    
    Also fixes wrong information and link to locale file related to
    Errors#full_messages in I18n guide.
  9. @carlosantoniodasilva
  10. @carlosantoniodasilva

    Fix callbacks order for destroying an object in validations guide

    carlosantoniodasilva committed Jan 25, 2012
    Also add around save to creating/updating callbacks order, and fix save
    example with no validation
  11. @lunks

    Duping log handler. fixes #4668

    lunks committed Jan 25, 2012
  12. @vijaydev

    Merge pull request #4673 from carlosantoniodasilva/validation-guides-…

    vijaydev committed Jan 25, 2012
    …update-3-2
    
    Validation guides update 3 2
  13. @tenderlove

    Merge pull request #4675 from lunks/3-2-stable

    tenderlove committed Jan 25, 2012
    Duping log handler on buffered logger silencer.
Commits on Jan 26, 2012
  1. @lest @josevalim

    call to_s on value passed to table_name=

    lest committed with josevalim Jan 26, 2012
    Signed-off-by: José Valim <jose.valim@gmail.com>
  2. @brainopia @fxn
  3. @fxn
  4. @fxn

    registers 2483460 in the CHANGELOG

    fxn committed Jan 26, 2012
  5. @rafaelfranca

    Remove extra attributes from HABTM join tables in AR tests

    rafaelfranca committed Jan 26, 2012
    HABTM Join tables should not have extra attributes
    
    When extra attributes is needed in HABTM join tables is better to use
    `has_many :through` association.
    
    Fix #4653
  6. @tenderlove
  7. @tenderlove

    Merge pull request #4696 from rafaelfranca/issue-4653

    tenderlove committed Jan 26, 2012
    Remove extra attributes from HABTM join tables in AR tests
  8. @tenderlove

    bumping journey to 1.0.1

    tenderlove committed Jan 26, 2012
  9. @atambo @josevalim

    safe_constantize should handle wrong constant name NameErrors Fixes #…

    atambo committed with josevalim Jan 26, 2012
    …4710
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
  10. @josevalim

    Revert usage of safe constantize

    josevalim committed Jan 26, 2012
    Signed-off-by: José Valim <jose.valim@gmail.com>
  11. @fxn

    CHANGELOG revision for v3.2.1

    fxn committed Jan 26, 2012
  12. @fxn

    updating RAILS_VERSION

    fxn committed Jan 26, 2012
  13. @fxn
Commits on Jan 27, 2012
  1. @jonleighton

    Merge pull request #4715 from pwim/find-create-multi-args

    jonleighton committed Jan 27, 2012
    Fix regression from Rails 3.1
  2. @carlosantoniodasilva

    check_box helper with :disabled => true generates disabled hidden fie…

    Tadas Tamošauskas committed with carlosantoniodasilva Jan 5, 2012
    …ld. fixes #1953
  3. @dmathieu @carlosantoniodasilva
  4. @josevalim

    Merge check box fixes from remote-tracking branch 'cantonio/checkbox-…

    josevalim committed Jan 27, 2012
    …hidden-backport' into 3-2-stable
  5. @dhh

    Revert "Fix expanding cache key for single element arrays"

    dhh committed Jan 27, 2012
    This reverts commit abe915f.
    
    This broke all existing keys and it's wrong anyway. The array is just there as a convenience option for building the string. It's intentional that [ "stuff"] and "stuff" generates the same key.
  6. @dhh
Commits on Jan 30, 2012
  1. @vijaydev

    fix typo [ci skip]

    vijaydev committed Jan 30, 2012
  2. @fxn
Commits on Jan 31, 2012
  1. @bsodmike

    clarification to prevent confusing newbies; Passenger/Unicorn are app…

    bsodmike committed Jan 31, 2012
    … servers, Apache/Nginx are the web servers along with thin a la Heroku etc.
  2. @jonleighton

    Merge pull request #4763 from kennyj/fix_4754

    jonleighton committed Jan 31, 2012
    [MySQL] Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES
  3. @jonleighton
  4. @jonleighton
  5. @lest

    fix assets test

    lest committed Jan 31, 2012
  6. @josevalim

    Merge pull request #4786 from lest/patch-2

    josevalim committed Jan 31, 2012
    fix assets test in 3-2-stable
  7. @kennyj
  8. @marten

    Fix use of Deprecation without requiring active_support/deprecation i…

    marten committed Jan 31, 2012
    …n ActiveSupport::Concern
  9. @marten

    Fix use of Deprecation without requiring active_support/deprecation i…

    marten committed Jan 31, 2012
    …n ActiveSupport::Concern in Base64
  10. @marten

    Fix use of Deprecation without requiring active_support/deprecation i…

    marten committed Jan 31, 2012
    …n message verifier
  11. @marten
  12. @josevalim

    Merge pull request #4790 from marten/fix-require-deprecation-in-activ…

    josevalim committed Jan 31, 2012
    …esupport
    
    Fix Deprecation usage in ActiveSupport when requiring only parts of AS
  13. @jonleighton

    Merge pull request #4783 from gregolsen/ids_reader_fix

    jonleighton committed Jan 31, 2012
    ids_reader method fixed, test added to has_many association (for PostgreSQL)
  14. @josevalim

    Merge pull request #4793 from kennyj/fix_4760

    josevalim committed Jan 31, 2012
    [3-2-stable] Fix GH #4760. A Block was not evaluated.
  15. @tenderlove

    Merge pull request #4779 from bsodmike/bsodmike-3-2-stable

    tenderlove committed Jan 31, 2012
    Update comment in Gemfile re Unicorn (minor clarification)
  16. @tenderlove

    Merge pull request #4735 from arton/master

    tenderlove committed Jan 31, 2012
    Re-launch assets:precompile task using original $0 if $0 is batch file so it works on Windows
  17. @jonleighton

    Improve deprecation message

    jonleighton committed Jan 31, 2012
Commits on Feb 1, 2012
  1. @rafaelfranca
  2. @spastorino

    Merge pull request #4811 from rafaelfranca/3-2-stable-fix

    spastorino committed Feb 1, 2012
    Fix broken build in 3-2-stable branch
  3. @kennyj
  4. @carlosantoniodasilva
  5. @spastorino

    Merge pull request #4815 from kennyj/fix_4749

    spastorino committed Feb 1, 2012
    Fix GH #4749. Remove branch options, because edge is not 3-2-stable.
  6. @josevalim

    Merge pull request #4822 from carlosantoniodasilva/strict-validation-3-2

    josevalim committed Feb 1, 2012
    Generate strict validation error messages with attribute name (3-2-stable)
  7. @sikachu

    Fix plugin_new test failure from c8c8439

    sikachu committed Feb 1, 2012
    `plugin_new` generator doesn't generate `sass-rails` in the Gemfile, so
    you can't check for that.
  8. @josevalim

    Merge pull request #4827 from sikachu/3-2-stable-fix-plugin-new

    josevalim committed Feb 1, 2012
    Fix plugin_new test failure from c8c8439
  9. @jonleighton

    Merge pull request #4543 from jdelStrother/find_or_init

    jonleighton committed Feb 1, 2012
    Don't instantiate two objects in collection proxy / find_or_instantiate_by
Commits on Feb 2, 2012
  1. @tenderlove

    Merge pull request #4809 from cfeist/feist-sqlite-binary-corruption

    tenderlove committed Feb 1, 2012
    Fix for SQLite binary data corrupter (to master branch)
Commits on Feb 3, 2012
  1. @densya203

    Fix Issue #4819

    densya203 committed Feb 3, 2012
    'uninitialized constant ActiveRecord::Deprecation in Rails3.2.1'
    
    Just a typo of 'ActiveSupport::...'
  2. @tenderlove

    Merge pull request #4868 from skult/3-2-stable

    tenderlove committed Feb 3, 2012
    Fix Issue #4819
  3. @sikachu

    Fix override API response bug in respond_with

    sikachu committed Feb 3, 2012
    Default responder was only using the given respond block when user
    requested for HTML format, or JSON/XML format with valid resource. This
    fix the responder so that it will use the given block regardless of the
    validity of the resource. Note that in this case you'll have to check
    for object's validity by yourself in the controller.
    
    Fixes #4796
Commits on Feb 4, 2012
  1. @fxn
  2. @josevalim @josevalim

    Merge pull request #4879 from kennyj/fix_4873

    josevalim committed with josevalim Feb 4, 2012
    Fix GH #4873. Allow swapping same class middleware.
  3. @josevalim

    Merge pull request #4870 from sikachu/3-2-stable-responder-fix

    josevalim committed Feb 4, 2012
    Fix override API response bug in respond_with
  4. @josevalim
Commits on Feb 5, 2012
  1. @kennyj
  2. @spastorino

    Merge pull request #4890 from kennyj/improvement_4883

    spastorino committed Feb 5, 2012
    GH #4883. Optional start_day argument for Time#all_week
Commits on Feb 6, 2012
  1. @josevalim @josevalim

    Merge pull request #4908 from kennyj/fix_3864

    josevalim committed with josevalim Feb 6, 2012
    Fix url_for method's behavior. GH #3684.
  2. @guilleiguaran

    Add branch to sass-rails and coffee-rails for apps generated with --d…

    guilleiguaran committed Feb 6, 2012
    …ev or --edge options (3.2.x)
  3. @tenderlove

    Merge pull request #4912 from guilleiguaran/fix-edge-gemfile

    tenderlove committed Feb 6, 2012
    Add branch to sass-rails and coffee-rails for apps generated with --dev or --edge (3-2-stable)
  4. @rmm5t

    Fixed force_ssl redirects to include original query params

    rmm5t committed Feb 6, 2012
    `ActionController.force_ssl` redirects http URLs to their https equivalent;
    however, when a URL contains a query string, the resulting redirect lacked the
    original query string.
Commits on Feb 7, 2012
  1. @guilleiguaran
  2. @josevalim

    Merge pull request #4920 from guilleiguaran/revert-gemfile-edge

    josevalim committed Feb 7, 2012
    In Rails 3.2.x --edge generate apps with rails 3-2-stable
  3. @iblue @fxn

    Fixed the documenation for 'to_xml'

    iblue committed with fxn Feb 7, 2012
  4. @rmm5t

    Added unit test to cover changes to RouteSet.url_for

    rmm5t committed Feb 7, 2012
    ActionDispatch::Routing::RouteSet.url_for now handles passing params through to
    ActionDispatch::Http::Url.url_for
  5. @josevalim

    Merge pull request #4916 from rmm5t/fix_force_ssl_redirect_with_params

    josevalim committed Feb 7, 2012
    Fixed force_ssl redirects to include original query params
  6. @fxn

    no need to check for this constant

    fxn committed Feb 7, 2012
  7. @tenderlove
  8. @jonleighton

    Fix attribute_before_type_cast for serialized attributes. Fixes #4837.

    jonleighton committed Feb 7, 2012
    Conflicts:
    
    	activerecord/lib/active_record/core.rb
Commits on Feb 8, 2012
  1. @paul @josevalim

    Handle nil in add_index :length option in MySQL

    paul committed with josevalim Jan 24, 2012
    Our schema.rb is being generated with an `add_index` line similar to this:
    
        add_index "foo", ["foo", "bar"], :name => "xxx", :length => {"foo"=>8, "bar=>nil}
    
    This is the same as it was on Rails 3.1.3, however, now when that
    schema.rb is evaluated, its generating bad SQL in MySQL:
    
        Mysql::Error: You have an error in your SQL syntax; check the manual
        that corresponds to your MySQL server version for the right syntax
        to use near '))' at line 1: CREATE UNIQUE INDEX
        `xxx` ON `foo` (`foo`(8), `bar`())
    
    This commit adds a check for nil on the length attribute to prevent the
    empty parens from being output.
    
    Conflicts:
    
    	activerecord/test/cases/migration/index_test.rb
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
  2. @josevalim
  3. @rafaelfranca
  4. @josevalim

    Merge pull request #4941 from rafaelfranca/fix-build

    josevalim committed Feb 8, 2012
    Use real table and columns for index test
Commits on Feb 10, 2012
  1. @tenderlove

    Merge pull request #4988 from kennyj/fix_4720-3

    tenderlove committed Feb 10, 2012
    Fix GH #4720. Routing problem with nested namespace and already camelized controller option.
  2. @jeremy @tenderlove

    Fix that failed tests should exit with a nonzero error code.

    jeremy committed with tenderlove Feb 7, 2012
    Partially reverts 14c89e7.
    
    Hat tip to @tenderlove for paring down the TestTask!
Commits on Feb 13, 2012
  1. @josevalim
Commits on Feb 14, 2012
  1. @josevalim @josevalim

    Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redo

    josevalim committed with josevalim Feb 14, 2012
    Always reenable _dump task in AR databases rake. Closes #5030
  2. @spastorino

    Rack body respond to each and not to join

    spastorino committed Feb 14, 2012
    This fixes undef `to_str' for Rack::Chunked::Body when using
    caches_action + streaming on an action
    
    Closes #5027
Commits on Feb 15, 2012
  1. @tenderlove
  2. @josevalim @josevalim

    Merge pull request #5049 from fabioyamate/master

    josevalim committed with josevalim Feb 15, 2012
    Fix sanitize_for_mass_assigment when role is nil
Commits on Feb 17, 2012
  1. @arunagw

    Fixes failing test with ruby 1.8.7-p358

    arunagw committed Feb 17, 2012
    Same as 91a9b24
  2. backporting #4918 to 3.2 stable; adding extra test for accept header …

    Aditya Sanghi committed Feb 17, 2012
    …given by googlebot
  3. @josevalim

    Merge pull request #5073 from asanghi/4918_backport

    josevalim committed Feb 17, 2012
    Backporting #4918 with one added test for googlebot accept header as I saw it
  4. @spastorino

    Merge pull request #5071 from arunagw/fix_failing_test_ruby187_p358

    spastorino committed Feb 17, 2012
    Fix failing test ruby187 p358
  5. @pixeltrix

    Fix ActionDispatch::Static to serve files with unencoded PCHAR

    pixeltrix committed Feb 17, 2012
    RFC 3986[1] allows sub-delim characters in path segments unencoded,
    however Rack::File requires them to be encoded so we use URI's
    unescape method to leave them alone and then escape them again.
    
    Also since the path gets passed to Dir[] we need to escape any glob
    characters in the path.
    
    [1]: http://www.ietf.org/rfc/rfc3986.txt
  6. @pixeltrix

    Simplify regexp

    pixeltrix committed Feb 17, 2012
Commits on Feb 18, 2012
  1. @arunagw

    fix test with ruby 187-p358

    arunagw committed Feb 18, 2012
  2. @fxn

    Merge pull request #5081 from arunagw/fix_ar_test

    fxn committed Feb 18, 2012
    Fix ar test
  3. @lest @vijaydev

    fix spacer template example

    lest committed with vijaydev Feb 12, 2012
  4. @oestrich @vijaydev
  5. @avakhov @vijaydev
  6. @ffmike @vijaydev
  7. @vijaydev

    fix a typo [ci skip]

    vijaydev committed Feb 18, 2012
Commits on Feb 19, 2012
  1. @pwnall
Commits on Feb 20, 2012
  1. @pixeltrix

    Remove fixture files with Windows incompatible filenames

    pixeltrix committed Feb 20, 2012
    Windows doesn't allow `\ / : * ? " < > |` in filenames so create
    the fixture files at runtime and ignore the incompatible ones when
    running on Windows.
  2. @funny-falcon @tenderlove

    sync __run_callbacks with ruby-trunk

    funny-falcon committed with tenderlove Feb 14, 2012
    https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/34580
    In this revision behavior of respond_to? had changed: now to ask about
    protected method one should pass second argument `true`
  3. @tenderlove
  4. @ckdake
  5. @josevalim

    Merge pull request #5101 from ckdake/ckdake_actionview_handler_reset

    josevalim committed Feb 20, 2012
    Reset memoized hash keys when new ActionView::Template handler is registered
  6. @spastorino
  7. @spastorino

    Fix a failing test

    spastorino committed Feb 20, 2012
  8. @lest @tenderlove
Commits on Feb 21, 2012
  1. @amatsuda @tenderlove

    add AS::SafeBuffer#clone_empty

    amatsuda committed with tenderlove Feb 13, 2012
  2. @amatsuda @tenderlove
  3. @amatsuda @tenderlove
  4. @kennyj

    Fix some warnings on 3-2-stable

    kennyj committed Feb 10, 2012
  5. @spastorino

    Merge pull request #5106 from kennyj/fix_warnings_20120210

    spastorino committed Feb 21, 2012
    [3-2-stable] Fix some warnings
  6. @spastorino

    Add CHANGELOG entry

    spastorino committed Feb 21, 2012
  7. @spastorino
  8. @tenderlove

    Merge pull request #5096 from lawso017/master

    tenderlove committed Feb 20, 2012
    Restoring ability to derive id/sequence from tables with nonstandard sequences for primary keys
  9. @spastorino
  10. @vijaydev

    fix bad docs from f373f29 [ci skip]

    vijaydev committed Feb 21, 2012
  11. @tenderlove

    ruby 2.0 makes protected methods return false for respond_to, so pass…

    tenderlove committed Feb 21, 2012
    … true as the second param
  12. @tenderlove
  13. @tenderlove
Commits on Feb 22, 2012
  1. @tenderlove
  2. @tenderlove

    bumping up arel

    tenderlove committed Feb 22, 2012
  3. @spastorino

    format lookup for partials is derived from the format in which the te…

    spastorino committed Feb 22, 2012
    …mplate is being rendered
    
    Closes #5025 part 2
  4. @spastorino

    Add CHANGELOG entry

    spastorino committed Feb 22, 2012
  5. @spastorino

    Fix CHANGELOG

    spastorino committed Feb 22, 2012
  6. @tenderlove

    updating RAILS_VERSION

    tenderlove committed Feb 22, 2012
  7. @tenderlove

    Merge pull request #5084 from johndouthat/patch-1

    tenderlove committed Feb 22, 2012
    Remove reference to rails_legacy_mapper, which isn't compatible with 3.2...
  8. @tenderlove

    Merge pull request #5084 from johndouthat/patch-1

    tenderlove committed Feb 22, 2012
    Remove reference to rails_legacy_mapper, which isn't compatible with 3.2...
  9. @tenderlove

    Merge pull request #5087 from pwnall/no_view_logger

    tenderlove committed Feb 22, 2012
    Remove reference to config.action_view.logger from Rails configuration guide
Commits on Feb 23, 2012
  1. @josevalim
  2. @tenderlove

    Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_pr…

    tenderlove committed Feb 13, 2012
    …epare
    
    Fix usage of psql in db:test:prepare
  3. @tenderlove

    Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_pr…

    tenderlove committed Feb 13, 2012
    …epare
    
    Fix usage of psql in db:test:prepare
Commits on Feb 25, 2012
  1. @arunagw

    Build fix for ruby187-p358

    arunagw committed Feb 25, 2012
  2. @fxn

    Merge pull request #5164 from arunagw/build_fix_ruby187-p358

    fxn committed Feb 25, 2012
    Build fix ruby187 p358
  3. @arunagw
  4. @fxn

    Merge pull request #5166 from arunagw/3-2-stable

    fxn committed Feb 25, 2012
    3 2 stable
  5. @arunagw

    assert => assert_equal

    arunagw committed Feb 25, 2012
  6. @spastorino

    Merge pull request #5170 from arunagw/3-2-stable

    spastorino committed Feb 25, 2012
    assert => assert_equal
  7. @noahhendrix @vijaydev

    Fixed typo in composed_of example with Money#<=>, was comparing amoun…

    noahhendrix committed with vijaydev Feb 24, 2012
    …t itself instead of other_money.amount
  8. @glitterfang @vijaydev

    Fix typo in match :to docs

    glitterfang committed with vijaydev Feb 23, 2012
  9. @RalphShnelvar

    Fixing Windows asset tag helper test failure

    RalphShnelvar committed Feb 25, 2012
    In asset_tag_helper_test.rb there is an assert on the number of bytes in a
    concatenated file.  This test failed because Windows converts \n to \r\n as
    the default for "w".  This is different than in *nix systems where there is
    no conversion done.
    
    THe test that failed was test_caching_stylesheet_link_tag_when_caching_on
    
    Using bin mode fixes this behavior on windows and makes no change on the
    *nix systems.
Commits on Feb 26, 2012
  1. @pixeltrix
  2. @rafaelfranca @tenderlove

    Revert "No need to pass options which is never used"

    rafaelfranca committed with tenderlove Feb 15, 2012
    Options is needed for some Rails extensions to determine when
    referential integrity should be disabled
    
    This reverts commit bcb466c.
    
    Fixes #5052
Commits on Feb 27, 2012
  1. @rafaelfranca
  2. @tenderlove

    Merge pull request #5179 from RalphShnelvar/Binary_mode_Window_bug

    tenderlove committed Feb 27, 2012
    Binary mode window bug
  3. @tenderlove

    Merge pull request #5190 from rafaelfranca/fix-393-3-2-stable

    tenderlove committed Feb 27, 2012
    [3-2-stable] Add a new line after the textarea opening tag.
  4. @tenderlove
Commits on Feb 28, 2012
  1. @kennyj
Commits on Feb 29, 2012
  1. @tenderlove

    Merge pull request #5206 from kennyj/fix_5173-32

    tenderlove committed Feb 29, 2012
    [3-2-stable] Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931
Commits on Mar 1, 2012
  1. @josevalim @tenderlove
  2. @tenderlove

    Merge branch '3-2-stable-security' into 3-2-2

    tenderlove committed Mar 1, 2012
    * 3-2-stable-security:
      Ensure [] respects the status of the buffer.
      delete vulnerable AS::SafeBuffer#[]
      use AS::SafeBuffer#clone_empty for flushing the output_buffer
      add AS::SafeBuffer#clone_empty
      fix output safety issue with select options
  3. @tenderlove

    bumping to 3.2.2

    tenderlove committed Mar 1, 2012
  4. @tenderlove

    Merge branch '3-2-2' into 3-2-stable

    tenderlove committed Mar 1, 2012
    * 3-2-2:
      bumping to 3.2.2
      Ensure [] respects the status of the buffer.
      Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare
      Merge pull request #5084 from johndouthat/patch-1
      updating RAILS_VERSION
      delete vulnerable AS::SafeBuffer#[]
      use AS::SafeBuffer#clone_empty for flushing the output_buffer
      add AS::SafeBuffer#clone_empty
      fix output safety issue with select options
Commits on Mar 2, 2012
  1. @fxn

    revert setting NOT NULL constraints in add_timestamps

    fxn committed Mar 2, 2012
    Commit 3dbedd2 added NOT NULL constraints both to table
    creation and modification. For creation the new default
    makes sense, but the generic situation for changing a
    table is that there exist records. Those records have
    no creation or modification timestamps, and in the
    general case you don't even know them, so when updating
    a table these constraints are not going to work. See
    a bug report for this use case in #3334.
  2. @drogus @spastorino
  3. @carlosantoniodasilva @drogus

    Stop SafeBuffer#clone_empty from issuing warnings

    carlosantoniodasilva committed with drogus Mar 2, 2012
    Logic in clone_empty method was dealing with old @dirty variable, which
    has changed by @html_safe in this commit:
    rails@139963c
    
    This was issuing a "not initialized variable" warning - related to:
    rails#5237
    
    The logic applied by this method is already handled by the [] override,
    so there is no need to reset the variable here.
  4. @spastorino

    Add CHANGELOG entry

    spastorino committed Mar 2, 2012
  5. @tenderlove

    only log an error if there is a logger. fixes #5226

    tenderlove committed Mar 2, 2012
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
Commits on Mar 3, 2012
  1. @spastorino
  2. @vijaydev

    CSS fix for guides. Closing #5028 [ci skip]

    vijaydev committed Feb 14, 2012
    In Ubuntu Chrome, in the last lines of code blocks, the underscore isn't
    visible. Increasing the line height slightly seems to fix this. This
    problem doesn't exist in Firefox even on Ubuntu. Too lazy to test in
    any other OS-browser combo :)
Commits on Mar 4, 2012
  1. @larskanis @drogus

    fix associations when using per class databases

    larskanis committed with drogus Nov 22, 2011
    would get ConnectionNotEstablished error because it always tried to use
    ActiveRecord::Base's connection, even though it should be using the connection
    of the model whose context we're operating in
  2. @carlosantoniodasilva @drogus
  3. @NZKoz

    Whitelist all attribute assignment by default.

    NZKoz committed Mar 4, 2012
    Change the default for newly generated applications to whitelist all attribute assignment.  Also update the generated model classes so users are reminded of the importance of attr_accessible.
Commits on Mar 5, 2012
  1. @rafaelfranca

    Only add the whitelist_attributes option if ActiveRecord is present

    rafaelfranca committed Mar 4, 2012
    Conflicts:
    
    	railties/test/generators/app_generator_test.rb
    	railties/test/isolation/abstract_unit.rb
  2. @rafaelfranca
  3. @NZKoz

    Merge pull request #5278 from rafaelfranca/fix-build-3-2

    NZKoz committed Mar 5, 2012
    [3-2-stable] Fix build
  4. @byroot @tenderlove
Commits on Mar 6, 2012
  1. @mariovisic @sikachu
  2. @sikachu

    Always passing a respond block from to responder

    sikachu committed Mar 6, 2012
    We should let the responder to decide what to do with the given
    overridden response block, and not short circuit it.
    
    Fixes #5280
  3. @josevalim

    Merge pull request #5299 from sikachu/3-2-stable-fix-responder

    josevalim committed Mar 6, 2012
    Always passing a respond block from to responder
  4. @mikel

    Increasing minimum version of mail due to security vulnerability foun…

    mikel committed Mar 6, 2012
    …d in Mail 2.4.1 for sendmail or exim
  5. @josevalim

    Use latest rack-cache.

    josevalim committed Mar 6, 2012
  6. @spastorino
Commits on Mar 7, 2012
  1. @josevalim
  2. @josevalim
  3. @carlosantoniodasilva @josevalim
  4. @josevalim
  5. @josevalim

    Merge pull request #5316 from Jacobkg/master

    josevalim committed Mar 7, 2012
    Update ActiveRecord::AttributeMethods#attribute_present? to return false for empty strings
  6. @kuahyeow @NZKoz

    Add tests to test that through associations are not readonly, and we …

    kuahyeow committed with NZKoz Mar 7, 2012
    …can update the records we retrive from the association
Commits on Mar 8, 2012
  1. @carlosantoniodasilva @vijaydev
  2. @Mik-die @vijaydev

    typo

    Mik-die committed with vijaydev Mar 4, 2012
  3. @swanandp @vijaydev
  4. @bschaeffer @vijaydev
  5. @mattreduce @vijaydev
  6. @caius @vijaydev

    Fix typo in isolated engine docs

    caius committed with vijaydev Mar 6, 2012
  7. @coreyhaines @vijaydev
  8. @vijaydev

    In a nested resource route, the parent resource param is <resource_na…

    vijaydev committed Mar 8, 2012
    …me>_id
    
    This fix was made by @coreyhaines on docrails and merged in master.
    Cleanly cherry picking into 3-2-stable wasn't possible.
  9. @vijaydev

    changelog updates [ci skip]

    vijaydev committed Mar 8, 2012
  10. @vijaydev
  11. @tenderlove

    make active_connection? return true only if there is an open connecti…

    tenderlove committed Mar 8, 2012
    …on in use for the current thread. fixes #5330
Commits on Mar 9, 2012
  1. @tenderlove
  2. @rafaelfranca

    Add test case to has_many through association when mass_assignment_sa…

    rafaelfranca committed Mar 5, 2012
    …nitizer is
    
    :strict
    
    Conflicts:
    
    	activerecord/test/models/person.rb
  3. @rafaelfranca
  4. @rafaelfranca

    Fix my name in the CHANGELOG to follow the convention

    rafaelfranca committed Mar 9, 2012
    Also add missing entries and use the formating convention
  5. @vijaydev

    Merge pull request #5350 from rafaelfranca/changelog-fix-3-2

    vijaydev committed Mar 9, 2012
    Changelog fix 3 2
  6. @josevalim

    Merge pull request #5347 from rafaelfranca/fix-has_many_association-3-2

    josevalim committed Mar 9, 2012
    [3-2-stable] Fix has many through associations when mass_assignment_sanitizer is :strict
Commits on Mar 12, 2012
  1. @pixeltrix

    Add dynamic find_or_create_by_{attribute}! method.

    pixeltrix committed Mar 12, 2012
    (cherry picked from commit 5282485d310d1a6ffcf55e4e7f56ab234e16880d)
    
    Conflicts:
    
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/dynamic_finder_match.rb
  2. @pixeltrix
  3. @jrochkind

    inline docs for clear_active_connections! no longer says it cleans de…

    jrochkind committed Mar 12, 2012
    …ad threads, it doesn't since 3.2.0
  4. @tenderlove

    Merge pull request #5391 from jrochkind/connection_pool_doc

    tenderlove committed Mar 12, 2012
    ConnectionPooll#clear_active_connections! rdoc inaccuracy since 3.2.0
  5. @tenderlove
Commits on Mar 13, 2012
  1. @parndt
  2. @parndt

    Fixed problem when fixture_path is not always defined (incidentally, …

    parndt committed Mar 13, 2012
    …only when ActiveRecord is according to test_help.rb).
  3. @denisj @arunagw

    fix activerecord query_method regression with offset into Fixnum

    denisj committed with arunagw Jan 11, 2012
    add test to show offset query_methods on mysql & mysql2
    
    change test to cover public API
  4. @josevalim

    Merge pull request #5400 from arunagw/issue_4409

    josevalim committed Mar 13, 2012
    Issue 4409
  5. @josevalim

    Merge pull request #5398 from parndt/fix_issue_5193

    josevalim committed Mar 13, 2012
    Fix issue 5193
  6. @rafaelfranca
  7. @rafaelfranca
  8. @rafaelfranca

    Use Ruby 1.8 hash syntax

    rafaelfranca committed Mar 13, 2012
  9. @josevalim

    Merge pull request #5410 from rafaelfranca/fix-scaffold-3-2

    josevalim committed Mar 13, 2012
    [3-2-stable] Do not use the attributes hash in the scaffold functional tests
  10. @kennyj

    [3-2-stable] Fix GH #5399. connection_pools's keys are ActiveRecord::…

    kennyj committed Mar 13, 2012
    …Base::ConnectionSpecification objects.
  11. @avakhov @vijaydev

    Fix layout method doc formatting

    avakhov committed with vijaydev Mar 10, 2012
  12. @britto @vijaydev

    Close string quotes

    britto committed with vijaydev Mar 8, 2012
  13. @tenderlove

    Merge pull request #5417 from kennyj/fix_5399-32

    tenderlove committed Mar 13, 2012
    [3-2-stable] Fix GH #5399. connection_pools's keys are ActiveRecord::Base::ConnectionSpecification objects.
  14. @jrochkind

    ConnectionPool.checkout takes account of ruby using 'non-blocking con…

    jrochkind committed Mar 13, 2012
    …dition variables' in mutex ConditionVariables