Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3 2 stable #5850

Closed
wants to merge 596 commits into from
Closed

3 2 stable #5850

wants to merge 596 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Feb 10, 2012

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

    Partially reverts 14c89e7.
    
    Hat tip to @tenderlove for paring down the TestTask!
    jeremy authored and tenderlove committed Feb 10, 2012
    Copy the full SHA
    92acd5d View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2012

  1. Fix deprecation warning in AS::Concern.

    José Valim committed Feb 13, 2012
    Copy the full SHA
    305d5d5 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2012

  1. Merge pull request rails#5038 from carlosantoniodasilva/fix-db-migrat…

    …e-redo
    
    Always reenable _dump task in AR databases rake. Closes rails#5030
    José Valim authored and josevalim committed Feb 14, 2012
    Copy the full SHA
    5f9a5a5 View commit details
    Browse the repository at this point in the history
  2. Rack body respond to each and not to join

    This fixes undef `to_str' for Rack::Chunked::Body when using
    caches_action + streaming on an action
    
    Closes rails#5027
    spastorino committed Feb 14, 2012
    Copy the full SHA
    7c79996 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2012

  1. Copy the full SHA
    201e67e View commit details
    Browse the repository at this point in the history
  2. Merge pull request rails#5049 from fabioyamate/master

    Fix sanitize_for_mass_assigment when role is nil
    José Valim authored and josevalim committed Feb 15, 2012
    Copy the full SHA
    a1b9acb View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2012

  1. Fixes failing test with ruby 1.8.7-p358

    Same as 91a9b24
    arunagw committed Feb 17, 2012
    Copy the full SHA
    c17608f View commit details
    Browse the repository at this point in the history
  2. backporting rails#4918 to 3.2 stable; adding extra test for accept he…

    …ader given by googlebot
    Aditya Sanghi committed Feb 17, 2012
    Copy the full SHA
    dffd85a View commit details
    Browse the repository at this point in the history
  3. Merge pull request rails#5073 from asanghi/4918_backport

    Backporting rails#4918 with one added test for googlebot accept header as I saw it
    José Valim committed Feb 17, 2012
    Copy the full SHA
    45503ec View commit details
    Browse the repository at this point in the history
  4. Merge pull request rails#5071 from arunagw/fix_failing_test_ruby187_p358

    Fix failing test ruby187 p358
    spastorino committed Feb 17, 2012
    Copy the full SHA
    1a0bc2a View commit details
    Browse the repository at this point in the history
  5. Fix ActionDispatch::Static to serve files with unencoded PCHAR

    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
    pixeltrix committed Feb 17, 2012
    4
    Copy the full SHA
    86d3bc3 View commit details
    Browse the repository at this point in the history
  6. Simplify regexp

    pixeltrix committed Feb 17, 2012
    Copy the full SHA
    1b4e6ca View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2012

  1. fix test with ruby 187-p358

    arunagw committed Feb 18, 2012
    Copy the full SHA
    742b615 View commit details
    Browse the repository at this point in the history
  2. Merge pull request rails#5081 from arunagw/fix_ar_test

    Fix ar test
    fxn committed Feb 18, 2012
    Copy the full SHA
    3b61efc View commit details
    Browse the repository at this point in the history
  3. Fix actionpack readme weblog example

    avakhov authored and vijaydev committed Feb 18, 2012
    Copy the full SHA
    168e653 View commit details
    Browse the repository at this point in the history
  4. Update Time#change docs to reflect the options it uses

    [ci skip]
    oestrich authored and vijaydev committed Feb 18, 2012
    Copy the full SHA
    ea54d2c View commit details
    Browse the repository at this point in the history
  5. fix spacer template example

    lest authored and vijaydev committed Feb 18, 2012
    Copy the full SHA
    ed3a15d View commit details
    Browse the repository at this point in the history
  6. Documenting the :inverse_of option for associations

    Mike Gunderloy authored and vijaydev committed Feb 18, 2012
    Copy the full SHA
    44849b1 View commit details
    Browse the repository at this point in the history
  7. fix a typo [ci skip]

    vijaydev committed Feb 18, 2012
    Copy the full SHA
    b2e9bbd View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2012

  1. Copy the full SHA
    64fa7f7 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2012

  1. Remove fixture files with Windows incompatible filenames

    Windows doesn't allow `\ / : * ? " < > |` in filenames so create
    the fixture files at runtime and ignore the incompatible ones when
    running on Windows.
    pixeltrix committed Feb 20, 2012
    Copy the full SHA
    41c182c View commit details
    Browse the repository at this point in the history
  2. sync __run_callbacks with ruby-trunk

    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`
    funny-falcon authored and tenderlove committed Feb 20, 2012
    Copy the full SHA
    0c0f278 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    3b824d6 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    68d3a46 View commit details
    Browse the repository at this point in the history
  5. Merge pull request rails#5101 from ckdake/ckdake_actionview_handler_r…

    …eset
    
    Reset memoized hash keys when new ActionView::Template handler is registered
    josevalim committed Feb 20, 2012
    Copy the full SHA
    8c870f1 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    8b86259 View commit details
    Browse the repository at this point in the history
  7. Fix a failing test

    spastorino committed Feb 20, 2012
    Copy the full SHA
    b80d8f7 View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    7b73913 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2012

  1. add AS::SafeBuffer#clone_empty

    amatsuda authored and tenderlove committed Feb 21, 2012
    Copy the full SHA
    621d219 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    42fabd2 View commit details
    Browse the repository at this point in the history
  3. delete vulnerable AS::SafeBuffer#[]

    amatsuda authored and tenderlove committed Feb 21, 2012
    Copy the full SHA
    dfa33fa View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    39d4617 View commit details
    Browse the repository at this point in the history
  5. Merge pull request rails#5106 from kennyj/fix_warnings_20120210

    [3-2-stable] Fix some warnings
    spastorino committed Feb 21, 2012
    Copy the full SHA
    c426591 View commit details
    Browse the repository at this point in the history
  6. Add CHANGELOG entry

    spastorino committed Feb 21, 2012
    Copy the full SHA
    b122968 View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    4eff6bc View commit details
    Browse the repository at this point in the history
  8. Merge pull request rails#5096 from lawso017/master

    Restoring ability to derive id/sequence from tables with nonstandard sequences for primary keys
    tenderlove committed Feb 21, 2012
    Copy the full SHA
    d70ed10 View commit details
    Browse the repository at this point in the history
  9. Copy the full SHA
    f92c812 View commit details
    Browse the repository at this point in the history
  10. Copy the full SHA
    cc848d6 View commit details
    Browse the repository at this point in the history
  11. ruby 2.0 makes protected methods return false for respond_to, so pass…

    … true as the second param
    tenderlove committed Feb 21, 2012
    Copy the full SHA
    0052d90 View commit details
    Browse the repository at this point in the history
  12. Copy the full SHA
    c73f883 View commit details
    Browse the repository at this point in the history
  13. Copy the full SHA
    a566ee5 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2012

  1. 2
    Copy the full SHA
    83e42d5 View commit details
    Browse the repository at this point in the history
  2. bumping up arel

    tenderlove committed Feb 22, 2012
    Copy the full SHA
    35626fe View commit details
    Browse the repository at this point in the history
  3. format lookup for partials is derived from the format in which the te…

    …mplate is being rendered
    
    Closes rails#5025 part 2
    spastorino committed Feb 22, 2012
    Copy the full SHA
    19433ce View commit details
    Browse the repository at this point in the history
  4. Add CHANGELOG entry

    spastorino committed Feb 22, 2012
    Copy the full SHA
    110b43c View commit details
    Browse the repository at this point in the history
  5. Fix CHANGELOG

    spastorino committed Feb 22, 2012
    Copy the full SHA
    82d6ded View commit details
    Browse the repository at this point in the history
  6. updating RAILS_VERSION

    tenderlove committed Feb 22, 2012
    Copy the full SHA
    4bcd437 View commit details
    Browse the repository at this point in the history
  7. Merge pull request rails#5084 from johndouthat/patch-1

    Remove reference to rails_legacy_mapper, which isn't compatible with 3.2...
    tenderlove committed Feb 22, 2012
    Copy the full SHA
    fadad9f View commit details
    Browse the repository at this point in the history
  8. Merge pull request rails#5084 from johndouthat/patch-1

    Remove reference to rails_legacy_mapper, which isn't compatible with 3.2...
    tenderlove committed Feb 22, 2012
    Copy the full SHA
    93f1667 View commit details
    Browse the repository at this point in the history
  9. Merge pull request rails#5087 from pwnall/no_view_logger

    Remove reference to config.action_view.logger from Rails configuration guide
    tenderlove committed Feb 22, 2012
    Copy the full SHA
    c5c3274 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2012

  1. Copy the full SHA
    419040f View commit details
    Browse the repository at this point in the history
  2. Merge pull request rails#4834 from sskirby/fix_usage_of_psql_in_db_te…

    …st_prepare
    
    Fix usage of psql in db:test:prepare
    tenderlove committed Feb 23, 2012
    Copy the full SHA
    6dbf6f3 View commit details
    Browse the repository at this point in the history
  3. Merge pull request rails#4834 from sskirby/fix_usage_of_psql_in_db_te…

    …st_prepare
    
    Fix usage of psql in db:test:prepare
    tenderlove committed Feb 23, 2012
    Copy the full SHA
    ecff25c View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2012

  1. Build fix for ruby187-p358

    arunagw committed Feb 25, 2012
    Copy the full SHA
    99fa8e5 View commit details
    Browse the repository at this point in the history
  2. Merge pull request rails#5164 from arunagw/build_fix_ruby187-p358

    Build fix ruby187 p358
    fxn committed Feb 25, 2012
    Copy the full SHA
    5661dab View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    0bfcd4f View commit details
    Browse the repository at this point in the history
  4. Merge pull request rails#5166 from arunagw/3-2-stable

    3 2 stable
    fxn committed Feb 25, 2012
    Copy the full SHA
    8125304 View commit details
    Browse the repository at this point in the history
  5. assert => assert_equal

    arunagw committed Feb 25, 2012
    Copy the full SHA
    a9b1397 View commit details
    Browse the repository at this point in the history
  6. Merge pull request rails#5170 from arunagw/3-2-stable

    assert => assert_equal
    spastorino committed Feb 25, 2012
    Copy the full SHA
    0a1357b View commit details
    Browse the repository at this point in the history
  7. Fixed typo in composed_of example with Money#<=>, was comparing amoun…

    …t itself instead of other_money.amount
    noahhendrix authored and vijaydev committed Feb 25, 2012
    Copy the full SHA
    e1f799a View commit details
    Browse the repository at this point in the history
  8. Fix typo in match :to docs

    glitterfang authored and vijaydev committed Feb 25, 2012
    Copy the full SHA
    b229bc7 View commit details
    Browse the repository at this point in the history
  9. Fixing Windows asset tag helper test failure

    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.
    RalphShnelvar committed Feb 25, 2012
    Copy the full SHA
    06dc8ed View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2012

  1. Copy the full SHA
    b8c4f2d View commit details
    Browse the repository at this point in the history
  2. Revert "No need to pass options which is never used"

    Options is needed for some Rails extensions to determine when
    referential integrity should be disabled
    
    This reverts commit bcb466c.
    
    Fixes rails#5052
    rafaelfranca authored and tenderlove committed Feb 26, 2012
    Copy the full SHA
    663904f View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2012

  1. Copy the full SHA
    2b4e7a7 View commit details
    Browse the repository at this point in the history
  2. Merge pull request rails#5179 from RalphShnelvar/Binary_mode_Window_bug

    Binary mode window bug
    tenderlove committed Feb 27, 2012
    Copy the full SHA
    b543f8f View commit details
    Browse the repository at this point in the history
  3. Merge pull request rails#5190 from rafaelfranca/fix-393-3-2-stable

    [3-2-stable] Add a new line after the textarea opening tag.
    tenderlove committed Feb 27, 2012
    Copy the full SHA
    210c33f View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    72ae0b4 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2012

  1. Copy the full SHA
    f1f2e8c View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2012

  1. Merge pull request rails#5206 from kennyj/fix_5173-32

    [3-2-stable] Fix type_to_sql with text and limit on mysql/mysql2. Fix GH rails#3931
    tenderlove committed Feb 29, 2012
    Copy the full SHA
    5bb5780 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2012

  1. Copy the full SHA
    55ac1b9 View commit details
    Browse the repository at this point in the history
  2. Merge branch '3-2-stable-security' into 3-2-2

    * 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
    tenderlove committed Mar 1, 2012
    Copy the full SHA
    c60c1c0 View commit details
    Browse the repository at this point in the history
  3. bumping to 3.2.2

    tenderlove committed Mar 1, 2012
    Copy the full SHA
    01b470f View commit details
    Browse the repository at this point in the history
  4. Merge branch '3-2-2' into 3-2-stable

    * 3-2-2:
      bumping to 3.2.2
      Ensure [] respects the status of the buffer.
      Merge pull request rails#4834 from sskirby/fix_usage_of_psql_in_db_test_prepare
      Merge pull request rails#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
    tenderlove committed Mar 1, 2012
    Copy the full SHA
    c289790 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2012

  1. revert setting NOT NULL constraints in add_timestamps

    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 rails#3334.
    fxn committed Mar 2, 2012
    1
    Copy the full SHA
    bbe7dac View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    1a71e84 View commit details
    Browse the repository at this point in the history
  3. Stop SafeBuffer#clone_empty from issuing warnings

    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.
    carlosantoniodasilva authored and drogus committed Mar 2, 2012
    Copy the full SHA
    5fd3601 View commit details
    Browse the repository at this point in the history
  4. Add CHANGELOG entry

    spastorino committed Mar 2, 2012
    Copy the full SHA
    8674823 View commit details
    Browse the repository at this point in the history
  5. only log an error if there is a logger. fixes rails#5226

    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
    tenderlove committed Mar 2, 2012
    Copy the full SHA
    af02291 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2012

  1. Copy the full SHA
    520571a View commit details
    Browse the repository at this point in the history
  2. CSS fix for guides. Closing rails#5028 [ci skip]

    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 :)
    vijaydev committed Mar 3, 2012
    Copy the full SHA
    23ca13a View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2012

  1. fix associations when using per class databases

    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
    larskanis authored and drogus committed Mar 4, 2012
    Copy the full SHA
    f6d478a View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    864d755 View commit details
    Browse the repository at this point in the history
  3. Whitelist all attribute assignment by default.

    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.
    NZKoz committed Mar 4, 2012
    65
    Copy the full SHA
    06a3a8a View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2012

  1. Only add the whitelist_attributes option if ActiveRecord is present

    Conflicts:
    
    	railties/test/generators/app_generator_test.rb
    	railties/test/isolation/abstract_unit.rb
    rafaelfranca committed Mar 5, 2012
    Copy the full SHA
    f604a63 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    2a6b7e5 View commit details
    Browse the repository at this point in the history
  3. Merge pull request rails#5278 from rafaelfranca/fix-build-3-2

    [3-2-stable] Fix build
    NZKoz committed Mar 5, 2012
    Copy the full SHA
    ebc5a19 View commit details
    Browse the repository at this point in the history
  4. Fix rails#5069 - Protect foreign key from mass assignment throught as…

    …sociation builder
    byroot authored and tenderlove committed Mar 5, 2012
    Copy the full SHA
    e1a882a View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2012

  1. Copy the full SHA
    5b73a3a View commit details
    Browse the repository at this point in the history
  2. Always passing a respond block from to responder

    We should let the responder to decide what to do with the given
    overridden response block, and not short circuit it.
    
    Fixes rails#5280
    sikachu committed Mar 6, 2012
    Copy the full SHA
    82a8698 View commit details
    Browse the repository at this point in the history
  3. Merge pull request rails#5299 from sikachu/3-2-stable-fix-responder

    Always passing a respond block from to responder
    josevalim committed Mar 6, 2012
    Copy the full SHA
    688e4f0 View commit details
    Browse the repository at this point in the history
  4. Increasing minimum version of mail due to security vulnerability foun…

    …d in Mail 2.4.1 for sendmail or exim
    Mikel Lindsaar committed Mar 6, 2012
    Copy the full SHA
    0d2798e View commit details
    Browse the repository at this point in the history
  5. Use latest rack-cache.

    josevalim committed Mar 6, 2012
    Copy the full SHA
    9c56401 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    74fe7e1 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2012

  1. Copy the full SHA
    bcea8cd View commit details
    Browse the repository at this point in the history
  2. 3
    Copy the full SHA
    e7560bc View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    b35fd40 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    3775058 View commit details
    Browse the repository at this point in the history
  5. Merge pull request rails#5316 from Jacobkg/master

    Update ActiveRecord::AttributeMethods#attribute_present? to return false for empty strings
    josevalim committed Mar 7, 2012
    Copy the full SHA
    524e8a1 View commit details
    Browse the repository at this point in the history
  6. Add tests to test that through associations are not readonly, and we …

    …can update the records we retrive from the association
    kuahyeow authored and NZKoz committed Mar 7, 2012
    Copy the full SHA
    9bcd662 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2012

  1. Copy the full SHA
    55cac81 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    e63f04c View commit details
    Browse the repository at this point in the history
  3. typo

    mikdiet authored and vijaydev committed Mar 8, 2012
    Copy the full SHA
    1f2224d View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    30feb8c View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    357e288 View commit details
    Browse the repository at this point in the history
  6. Fix typo in asset pipeline guide

    Matthew Conway authored and vijaydev committed Mar 8, 2012
    Copy the full SHA
    061f8ae View commit details
    Browse the repository at this point in the history
  7. Fix typo in isolated engine docs

    caius authored and vijaydev committed Mar 8, 2012
    Copy the full SHA
    22a8433 View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    df755d4 View commit details
    Browse the repository at this point in the history
  9. In a nested resource route, the parent resource param is <resource_na…

    …me>_id
    
    This fix was made by @coreyhaines on docrails and merged in master.
    Cleanly cherry picking into 3-2-stable wasn't possible.
    vijaydev committed Mar 8, 2012
    Copy the full SHA
    c1a01c7 View commit details
    Browse the repository at this point in the history
  10. changelog updates [ci skip]

    vijaydev committed Mar 8, 2012
    Copy the full SHA
    3bfd651 View commit details
    Browse the repository at this point in the history
  11. Copy the full SHA
    263d842 View commit details
    Browse the repository at this point in the history
  12. make active_connection? return true only if there is an open connecti…

    …on in use for the current thread. fixes rails#5330
    tenderlove committed Mar 8, 2012
    3
    Copy the full SHA
    cff19cf View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2012

  1. Copy the full SHA
    94b2c8c View commit details
    Browse the repository at this point in the history
  2. Add test case to has_many through association when mass_assignment_sa…

    …nitizer is
    
    :strict
    
    Conflicts:
    
    	activerecord/test/models/person.rb
    rafaelfranca committed Mar 9, 2012
    Copy the full SHA
    7cd4063 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    f18c054 View commit details
    Browse the repository at this point in the history
  4. Fix my name in the CHANGELOG to follow the convention

    Also add missing entries and use the formating convention
    rafaelfranca committed Mar 9, 2012
    Copy the full SHA
    db743ff View commit details
    Browse the repository at this point in the history
  5. Merge pull request rails#5350 from rafaelfranca/changelog-fix-3-2

    Changelog fix 3 2
    vijaydev committed Mar 9, 2012
    Copy the full SHA
    9814420 View commit details
    Browse the repository at this point in the history
  6. Merge pull request rails#5347 from rafaelfranca/fix-has_many_associat…

    …ion-3-2
    
    [3-2-stable] Fix has many through associations when mass_assignment_sanitizer is :strict
    josevalim committed Mar 9, 2012
    Copy the full SHA
    2b9041b View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2012

  1. Add dynamic find_or_create_by_{attribute}! method.

    (cherry picked from commit 5282485d310d1a6ffcf55e4e7f56ab234e16880d)
    
    Conflicts:
    
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/dynamic_finder_match.rb
    pixeltrix committed Mar 12, 2012
    Copy the full SHA
    90d9635 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    a01f0ab View commit details
    Browse the repository at this point in the history
  3. inline docs for clear_active_connections! no longer says it cleans de…

    …ad threads, it doesn't since 3.2.0
    jrochkind committed Mar 12, 2012
    Copy the full SHA
    bb8f4c2 View commit details
    Browse the repository at this point in the history
  4. Merge pull request rails#5391 from jrochkind/connection_pool_doc

    ConnectionPooll#clear_active_connections! rdoc inaccuracy since 3.2.0
    tenderlove committed Mar 12, 2012
    Copy the full SHA
    da0595d View commit details
    Browse the repository at this point in the history
  5. 3
    Copy the full SHA
    5f26ce6 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2012

  1. Copy the full SHA
    f665e20 View commit details
    Browse the repository at this point in the history
  2. Fixed problem when fixture_path is not always defined (incidentally, …

    …only when ActiveRecord is according to test_help.rb).
    parndt committed Mar 13, 2012
    Copy the full SHA
    5ef8069 View commit details
    Browse the repository at this point in the history
  3. fix activerecord query_method regression with offset into Fixnum

    add test to show offset query_methods on mysql & mysql2
    
    change test to cover public API
    denisj authored and arunagw committed Mar 13, 2012
    Copy the full SHA
    f67944e View commit details
    Browse the repository at this point in the history
  4. Merge pull request rails#5400 from arunagw/issue_4409

    Issue 4409
    josevalim committed Mar 13, 2012
    Copy the full SHA
    a9320f7 View commit details
    Browse the repository at this point in the history
  5. Merge pull request rails#5398 from parndt/fix_issue_5193

    Fix issue 5193
    josevalim committed Mar 13, 2012
    Copy the full SHA
    d2ac18a View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    5bed0e5 View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    ac8469d View commit details
    Browse the repository at this point in the history
  8. Use Ruby 1.8 hash syntax

    rafaelfranca committed Mar 13, 2012
    Copy the full SHA
    c1610eb View commit details
    Browse the repository at this point in the history
  9. Merge pull request rails#5410 from rafaelfranca/fix-scaffold-3-2

    [3-2-stable] Do not use the attributes hash in the scaffold functional tests
    josevalim committed Mar 13, 2012
    Copy the full SHA
    dfbbf31 View commit details
    Browse the repository at this point in the history
  10. [3-2-stable] Fix GH rails#5399. connection_pools's keys are ActiveRec…

    …ord::Base::ConnectionSpecification objects.
    kennyj committed Mar 13, 2012
    Copy the full SHA
    21d9c0f View commit details
    Browse the repository at this point in the history
  11. Fix layout method doc formatting

    avakhov authored and vijaydev committed Mar 13, 2012
    Copy the full SHA
    5f28145 View commit details
    Browse the repository at this point in the history
  12. Close string quotes

    britto authored and vijaydev committed Mar 13, 2012
    Copy the full SHA
    a782fea View commit details
    Browse the repository at this point in the history
  13. Merge pull request rails#5417 from kennyj/fix_5399-32

    [3-2-stable] Fix GH rails#5399. connection_pools's keys are ActiveRecord::Base::ConnectionSpecification objects.
    tenderlove committed Mar 13, 2012
    Copy the full SHA
    596ecf7 View commit details
    Browse the repository at this point in the history
  14. ConnectionPool.checkout takes account of ruby using 'non-blocking con…

    …dition variables' in mutex ConditionVariables
    jrochkind committed Mar 13, 2012
    Copy the full SHA
    41563b4 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2012

  1. Merge pull request rails#5423 from jrochkind/checkout_account_for_mon…

    …itor_model
    
    ConnectionPool.checkout needs to be restructured to take account of ruby's "non-blocking" strategy for mutex ConditionVariables
    tenderlove committed Mar 14, 2012
    Copy the full SHA
    f2aea24 View commit details
    Browse the repository at this point in the history
  2. Do not include the authenticity token in forms where remote: true as …

    …ajax forms use the meta-tag value
    dhh committed Mar 14, 2012
    11
    Copy the full SHA
    16ee611 View commit details
    Browse the repository at this point in the history
  3. Allow you to force the authenticity_token to be rendered even on remo…

    …te forms if you pass true
    dhh committed Mar 14, 2012
    Copy the full SHA
    e50abba View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2012

  1. Remove ActionController::TestCase#rescue_action_in_public!

    This method has no effect since exception handling was
    moved to middlewares and ActionController tests do not
    use any middlewares.
    drogus committed Mar 15, 2012
    Copy the full SHA
    ccf4ff0 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    9dfb41f View commit details
    Browse the repository at this point in the history
  3. Merge pull request rails#5338 from mreinsch/3-2-static_invalid_byte_s…

    …equence
    
    3 2 static invalid byte sequence
    tenderlove committed Mar 15, 2012
    Copy the full SHA
    f918137 View commit details
    Browse the repository at this point in the history
  4. Merge pull request rails#5437 from kennyj/fix_5430

    Fix GH rails#5430. A Payload name for schema_search_path should be SCHEMA.
    tenderlove committed Mar 15, 2012
    Copy the full SHA
    bd3e1ed View commit details
    Browse the repository at this point in the history
  5. Merge pull request rails#5456 from brianmario/redirect-sanitization

    Strip null bytes from Location header
    tenderlove committed Mar 15, 2012
    Copy the full SHA
    f52ad6c View commit details
    Browse the repository at this point in the history
  6. Merge pull request rails#5457 from brianmario/typo-fix

    Fix typo in redirect test
    tenderlove committed Mar 15, 2012
    Copy the full SHA
    e135ff1 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2012

  1. Fix rails#5440 - multiple render_to_string breaks partials formats

    This fixes situation where rendering template to string
    sets `rendered_format` to the format rendered there.
    This is ok to have consistent formats rendered in partials,
    but it breaks on next renders if format is explicitly set
    or on last render where default format does not necessarily
    need to be the format of first rendered template.
    drogus committed Mar 17, 2012
    Copy the full SHA
    1eb6189 View commit details
    Browse the repository at this point in the history
  2. Add missing test for rails#5308

    drogus committed Mar 17, 2012
    Copy the full SHA
    7130f91 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    e5b46cf View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    c0a5b85 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    41815f5 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2012

  1. Copy the full SHA
    f4f9ec1 View commit details
    Browse the repository at this point in the history
  2. Merge pull request rails#5493 from kennyj/fix_5435-32

    [3-2-stable] Fix GH rails#5435. db:structure:dump should be re-enable.
    drogus committed Mar 18, 2012
    Copy the full SHA
    d9355be View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    9451201 View commit details
    Browse the repository at this point in the history
  4. Merge pull request rails#5498 from arunagw/build_fix_app_generator_te…

    …st_3-2-stable
    
    Build fix app generator test 3 2 stable
    josevalim committed Mar 18, 2012
    Copy the full SHA
    c8fbd48 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2012

  1. Increase minimum version of mail.

      Second security vulnerability found in mail file delivery method
      patched in version 2.4.4.
    Mikel Lindsaar committed Mar 19, 2012
    Copy the full SHA
    74b7829 View commit details
    Browse the repository at this point in the history
  2. Build fix for ruby1.8.7-358

    arunagw committed Mar 19, 2012
    Copy the full SHA
    fcc8743 View commit details
    Browse the repository at this point in the history
  3. Merge pull request rails#5505 from arunagw/build_fix_1.8.7-3-2-stable

    Build fix 1.8.7 3 2 stable
    josevalim committed Mar 19, 2012
    Copy the full SHA
    358333f View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2012

  1. We dont need to merge in the parameters as thats all being reset by t…

    …he rack headers (and its causing problems for Strong Parameters attempt of wrapping request.parameters because it will change in testing)
    dhh committed Mar 20, 2012
    Copy the full SHA
    275ee0d View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2012

  1. Copy the full SHA
    57c6b4c View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    565bfb9 View commit details
    Browse the repository at this point in the history
  3. Merge pull request rails#5533 from mhfs/migration_blank_line_3_2

    [3-2-stable] Remove blank line from generated migration
    josevalim committed Mar 21, 2012
    Copy the full SHA
    f829515 View commit details
    Browse the repository at this point in the history
  4. [3-2-stable] Port of rails#5522 'Fix adding/removing field's index wh…

    …en generating migration'
    mhfs committed Mar 21, 2012
    Copy the full SHA
    35bf748 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2012

  1. Merge pull request rails#5542 from mhfs/port_5522_to_32stable

    Port of rails#5522 'Fix adding/removing field's index when generating migration'
    drogus committed Mar 22, 2012
    Copy the full SHA
    89f8866 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    8c262f7 View commit details
    Browse the repository at this point in the history
  3. Merge pull request rails#5525 from kennyj/fix_5411

    Fix GH rails#5411. When precompiling, params method is undefined.
    josevalim committed Mar 22, 2012
    Copy the full SHA
    b714140 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2012

  1. Add order to tests that rely on db ordering, to fix failing tests on pg

    Also skip persistente tests related to UPDATE + ORDER BY for postgresql
    
    PostgreSQL does not support updates with order by, and these tests are
    failing randomly depending on the fixture loading order now.
    carlosantoniodasilva committed Mar 23, 2012
    Copy the full SHA
    b332891 View commit details
    Browse the repository at this point in the history
  2. Merge pull request rails#5557 from carlosantoniodasilva/fix-build-3-2

    Fix build for branch 3-2-stable
    tenderlove committed Mar 23, 2012
    Copy the full SHA
    ea4e021 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    0879ebd View commit details
    Browse the repository at this point in the history
  4. Merge pull request rails#5558 from carlosantoniodasilva/fix-build-3-2

    Fix build for branch 3-2-stable - Part 2
    drogus committed Mar 23, 2012
    Copy the full SHA
    ef48cea View commit details
    Browse the repository at this point in the history
  5. Merge pull request rails#5537 from kennyj/fix_4399-32

    [3-2-stable] migrate(:down) method with table_name_prefix
    tenderlove committed Mar 23, 2012
    Copy the full SHA
    0382e44 View commit details
    Browse the repository at this point in the history
  6. 3
    Copy the full SHA
    eb0d8ee View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2012

  1. Return the same session data object when setting session id

    Make sure to return the same hash object instead of returning a new one.
    Returning a new one causes failures on cookie store tests, where it
    tests for the 'Set-Cookie' header with the session signature.
    
    This is due to the hash ordering changes on Ruby 1.8.7-p358.
    carlosantoniodasilva committed Mar 24, 2012
    Copy the full SHA
    907bcce View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2012

  1. Copy the full SHA
    ed7567c View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    bd8a970 View commit details
    Browse the repository at this point in the history
  3. Merge pull request rails#5596 from lest/patch-3

    apply form_for namespace option to date_select
    drogus committed Mar 26, 2012
    Copy the full SHA
    3f1b8c6 View commit details
    Browse the repository at this point in the history
  4. Merge pull request rails#5597 from carlosantoniodasilva/fix-build-3-2

    Fix build for branch 3-2-stable - return the same session hash object
    josevalim committed Mar 26, 2012
    Copy the full SHA
    0e916ae View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2012

  1. Merge pull request rails#2621 from icco/master

    Issue with schema dump
    tenderlove committed Mar 27, 2012
    Copy the full SHA
    3eb5be6 View commit details
    Browse the repository at this point in the history
  2. If partial is rendered in controller, grab format from template

    Previously `rendered_format` was set only based on mime types
    passed in Accept header, which was wrong if first type from
    Accept was different than rendered partial. The fix is to simply
    move setting rendered_format to the place where template
    is available and grab format from the template. If it fails
    we can fallback to formats passed by Accept header.
    drogus committed Mar 27, 2012
    Copy the full SHA
    449a4fc View commit details
    Browse the repository at this point in the history
  3. Merge pull request rails#5603 from drogus/fix-rendered-format-for-ren…

    …der-partial
    
    Fix rendered format for render partial
    josevalim committed Mar 27, 2012
    Copy the full SHA
    e31ec47 View commit details
    Browse the repository at this point in the history
  4. Fixing issue rails#2492. ActionView::Base.field_error_proc doesn't ca…

    …ll for label.
    
    objectify_options method should be applied to the proper options arg.
    
    See explanation and example of the bug - https://github.com/kryzhovnik/rails_field_error_proc_bug_example
    kryzhovnik committed Mar 27, 2012
    Copy the full SHA
    7111133 View commit details
    Browse the repository at this point in the history
  5. Bumping to 3.2.3.rc1

    spastorino committed Mar 27, 2012
    Copy the full SHA
    5f37260 View commit details
    Browse the repository at this point in the history
  6. force datetime attributes to be changed

    backport ddb5d2f to 3-2-stable
    lest committed Mar 27, 2012
    Copy the full SHA
    fdcfc75 View commit details
    Browse the repository at this point in the history
  7. Merge pull request rails#5618 from lest/patch-1

    force datetime attributes to be changed
    drogus committed Mar 27, 2012
    Copy the full SHA
    c4048b3 View commit details
    Browse the repository at this point in the history
  8. Don't break Haml with textarea newline fix.

    See issue rails#393, issue rails#4000, issue rails#5190, and issue rails#5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.)
    
    Also fix 6 more tests that didn't yet have the newline expectation.
    jcoleman committed Mar 27, 2012
    2
    Copy the full SHA
    a7a422e View commit details
    Browse the repository at this point in the history
  9. adding a branch to arel

    tenderlove committed Mar 27, 2012
    Copy the full SHA
    24208d9 View commit details
    Browse the repository at this point in the history
  10. Merge pull request rails#5619 from jcoleman/textarea-newline-fix-brea…

    …ks-haml
    
    Textarea newline fix breaks haml (3-2-stable)
    spastorino committed Mar 27, 2012
    Copy the full SHA
    d82e4c8 View commit details
    Browse the repository at this point in the history
  11. Merge pull request rails#5619 from jcoleman/textarea-newline-fix-brea…

    …ks-haml
    
    Textarea newline fix breaks haml (3-2-stable)
    spastorino committed Mar 27, 2012
    Copy the full SHA
    4f66586 View commit details
    Browse the repository at this point in the history
  12. Copy the full SHA
    6968bc1 View commit details
    Browse the repository at this point in the history
  13. Merge pull request rails#5622 from rafaelfranca/fix-2492-3-2

    [3-2-stable] Fix label_tag to merge the options hash with the object hash
    jeremy committed Mar 27, 2012
    Copy the full SHA
    460d2c7 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2012

  1. Copy the full SHA
    79c8def View commit details
    Browse the repository at this point in the history
  2. Merge pull request rails#5624 from rafaelfranca/fix-build

    Fix build
    NZKoz committed Mar 28, 2012
    Copy the full SHA
    f8b4ef1 View commit details
    Browse the repository at this point in the history
  3. Merge pull request rails#5616 from cbartlett/migration-indent

    Fix indenting in migration generator
    spastorino committed Mar 28, 2012
    Copy the full SHA
    2d5b60e View commit details
    Browse the repository at this point in the history
  4. Added config.action_view.embed_authenticity_token_in_remote_forms

    There is a regression introduced in 16ee611, which breaks
    remote forms that should also work without javascript. This commit
    introduces config option that allows to configure this behavior
    defaulting to the old behavior (ie. include authenticity token
    in remote forms by default)
    drogus committed Mar 28, 2012
    3
    Copy the full SHA
    d646d9d View commit details
    Browse the repository at this point in the history
  5. Merge pull request rails#5633 from drogus/embed-auth-token-in-remote-…

    …forms
    
    Embed auth token in remote forms
    spastorino committed Mar 28, 2012
    Copy the full SHA
    0d052c0 View commit details
    Browse the repository at this point in the history
  6. Merge pull request rails#5633 from drogus/embed-auth-token-in-remote-…

    …forms
    
    Embed auth token in remote forms
    spastorino committed Mar 28, 2012
    Copy the full SHA
    84ca8c8 View commit details
    Browse the repository at this point in the history
  7. Test for rails#5549.

    Cherry-picked from e96d04a.
    
    Conflicts:
    
    	activerecord/lib/active_record/attribute_methods/read.rb
    tenderlove authored and jonleighton committed Mar 28, 2012
    Copy the full SHA
    4c44ca5 View commit details
    Browse the repository at this point in the history
  8. Fix rails#5549.

    jonleighton committed Mar 28, 2012
    Copy the full SHA
    1b9fd79 View commit details
    Browse the repository at this point in the history
  9. Cover one more case in auth_token and remote forms

    If embedding auth_token in remote forms is off and we
    pass a value for auth_token it should respect it.
    drogus committed Mar 28, 2012
    Copy the full SHA
    d5980b5 View commit details
    Browse the repository at this point in the history
  10. Cover one more case in auth_token and remote forms

    If embedding auth_token in remote forms is off and we
    pass a value for auth_token it should respect it.
    drogus committed Mar 28, 2012
    Copy the full SHA
    db2c135 View commit details
    Browse the repository at this point in the history
  11. Change the order argument from ('id') to ('taggings.id')

    to address ORA-00918 error
    yahonda committed Mar 28, 2012
    Copy the full SHA
    ef3f809 View commit details
    Browse the repository at this point in the history
  12. Merge pull request rails#5640 from yahonda/address_ora_00918_with_oracle

    Address an error for test_has_many_through_polymorphic_has_one with Oracle
    spastorino committed Mar 28, 2012
    Copy the full SHA
    f369f77 View commit details
    Browse the repository at this point in the history
  13. Copy the full SHA
    5747e53 View commit details
    Browse the repository at this point in the history
  14. Copy the full SHA
    87825a6 View commit details
    Browse the repository at this point in the history
  15. Changed the config.assets.manifest to nil in the comments in the prod…

    …uction config template.
    andhapp committed Mar 28, 2012
    Copy the full SHA
    a157d59 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2012

  1. Merge pull request rails#5644 from andhapp/fix-config-asset-manifest-3-2

    Changed the config.assets.manifest to nil
    spastorino committed Mar 29, 2012
    Copy the full SHA
    2b2a760 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    1d753ab View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    921c404 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    dd69076 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    b395ca1 View commit details
    Browse the repository at this point in the history
  6. Bumping to 3.2.3.rc2

    spastorino committed Mar 29, 2012
    Copy the full SHA
    5284e65 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2012

  1. Copy the full SHA
    b29e868 View commit details
    Browse the repository at this point in the history
  2. Do not add record to identity map if the record doesn't have values f…

    …or all the columns, so we don't get 'MissingAttributeError' later when trying to access other fields of the same record.
    arturopie committed Mar 30, 2012
    Copy the full SHA
    2c8f84d View commit details
    Browse the repository at this point in the history
  3. refactor the checking of the attributes of the record in IdentityMap#…

    …add, so it's more readable
    arturopie committed Mar 30, 2012
    Copy the full SHA
    714a2c8 View commit details
    Browse the repository at this point in the history
  4. refactor instantiate method in base, so we remove nesting if's which …

    …make the code harder to read. Minor changes to contain_all_columns in IdentityMap.
    
    Conflicts:
    
    	activerecord/lib/active_record/base.rb
    arturopie committed Mar 30, 2012
    Copy the full SHA
    6896cd4 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    13fe190 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    5c7bb86 View commit details
    Browse the repository at this point in the history
  7. Fix rails#5667. Preloading should ignore scoping.

    Conflicts:
    
    	activerecord/test/cases/associations/eager_test.rb
    jonleighton committed Mar 30, 2012
    Copy the full SHA
    dffbb52 View commit details
    Browse the repository at this point in the history
  8. Bump up to 3.2.3

    spastorino committed Mar 30, 2012
    Copy the full SHA
    45d6cd9 View commit details
    Browse the repository at this point in the history
  9. Copy the full SHA
    69465d9 View commit details
    Browse the repository at this point in the history
  10. Merge pull request rails#5662 from arturopie/3-2_fixing_IM_when_using…

    …_find_select
    
    Fixing Identity Map when using find select in rails 3.2
    tenderlove committed Mar 30, 2012
    Copy the full SHA
    9894d16 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2012

  1. Copy the full SHA
    27fc6ec View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2012

  1. Usage file in generators shouldn't be fetched only based on source_root

    In case `source_roout` is not set, `default_source_root` is used,
    which includes also `templates` directory. If there is no `templates`
    directory, `default_source_root` is not available and USAGE will not
    be displayed. USAGE should be also checked based on default
    directory excluding `templates`.
    drogus committed Apr 1, 2012
    Copy the full SHA
    515e1d3 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2012

  1. Copy the full SHA
    8e315b0 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2012

  1. Copy the full SHA
    6f19262 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    93f25ac View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    d46ad34 View commit details
    Browse the repository at this point in the history
  4. Merge pull request rails#5727 from hone/ar_database_url_logging

    ActiveRecord configuration logging
    tenderlove committed Apr 4, 2012
    Copy the full SHA
    c4d3102 View commit details
    Browse the repository at this point in the history
  5. Merge pull request rails#5188 from jlxw/patch-1

    logger.silence is deprecated
    spastorino committed Apr 4, 2012
    Copy the full SHA
    6663dd0 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    1124ac0 View commit details
    Browse the repository at this point in the history
  7. Merge pull request rails#5737 from rafaelfranca/3-2-stable

    Fix tests of benchmark with silence equals to true
    spastorino committed Apr 4, 2012
    Copy the full SHA
    56d9945 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2012

  1. Copy the full SHA
    1cd939a View commit details
    Browse the repository at this point in the history
  2. Merge pull request rails#5765 from anildigital/3-2-stable

    Update getting started guide to change Rails version to Rails 3.2
    vijaydev committed Apr 6, 2012
    Copy the full SHA
    bfd5c84 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2012

  1. Fix 'Everyday Git' link

    anildigital authored and vijaydev committed Apr 7, 2012
    Copy the full SHA
    05d4ccf View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2012

  1. Copy the full SHA
    5c7bcfc View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    6f4f499 View commit details
    Browse the repository at this point in the history
  3. Merge pull request rails#5784 from rafaelfranca/default_url-3-2

    [3-2-stable] Document that default_url_options must return a hash with symbolized keys
    spastorino committed Apr 9, 2012
    Copy the full SHA
    e7671b5 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    b125db8 View commit details
    Browse the repository at this point in the history
  5. Merge pull request rails#5725 from kevmoo/remove_unused_castcode

    Remove unused castcode
    fxn committed Apr 9, 2012
    Copy the full SHA
    dab76b1 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2012

  1. README fix! [skip ci]

    arunagw committed Apr 10, 2012
    Copy the full SHA
    b1c28d7 View commit details
    Browse the repository at this point in the history
  2. Merge pull request rails#5799 from arunagw/readme_fix

    Readme fix
    vijaydev committed Apr 10, 2012
    Copy the full SHA
    a85ffd0 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    ca0c0a2 View commit details
    Browse the repository at this point in the history
  4. bigdecimal can be duped on Ruby 2.0

    Conflicts:
    
    	activesupport/test/core_ext/duplicable_test.rb
    tenderlove authored and arunagw committed Apr 10, 2012
    Copy the full SHA
    2991370 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    fedd87c View commit details
    Browse the repository at this point in the history
  6. Merge pull request rails#5800 from arunagw/bigdecimal_dup

    Backport BigDecimal#duplicable? feature check from master
    jeremy committed Apr 10, 2012
    Copy the full SHA
    e0fd4fc View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2012

  1. Copy the full SHA
    96d81e5 View commit details
    Browse the repository at this point in the history
  2. Merge pull request rails#5820 from arunagw/more_ruby-2-0-fixes

    Update test for Ruby 2 compatibility
    jeremy committed Apr 12, 2012
    Copy the full SHA
    e473e1f View commit details
    Browse the repository at this point in the history
  3. Fix code example in generator test case

    sikachu authored and vijaydev committed Apr 12, 2012
    Copy the full SHA
    c0e6a85 View commit details
    Browse the repository at this point in the history
  4. fix typo in readme [ci skip]

    vijaydev committed Apr 12, 2012
    Copy the full SHA
    efa9a1f View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2012

  1. fixed rails#5845

    angelo giovanni capilleri authored and angelo giovanni capilleri committed Apr 15, 2012
    Copy the full SHA
    0b1fb51 View commit details
    Browse the repository at this point in the history