Permalink
Commits on Jul 24, 2012
  1. Merge pull request #7148 from yahonda/address_6195

    rafaelfranca committed Jul 24, 2012
    Addresses ORA-01400 errors and also supports #6115
  2. Merge pull request #7150 from lucasmazza/flush_option

    rafaelfranca committed Jul 24, 2012
    Replace the flush parameter with a Hash.
  3. This pull requests addresses ORA-01400 errors and also supports #6115

    yahonda committed Jul 24, 2012
    …issue tested.
    
    Issue #6115 has been fixed and tested with
    the attribute `:null => false, :default => ""`
    However `:null => false` attribute is not necessary to test this issue,
    which causes many ORA-01400 errors with Oracle enhanced adapter.
  4. Merge pull request #6991 from frodsan/performance_test_generator

    rafaelfranca committed Jul 24, 2012
    update performance test template to use test method
  5. Merge pull request #7143 from accessd/fix-typo-callbacks-test

    spastorino committed Jul 24, 2012
    fix typo in validations callbacks test
  6. fix typo in callbacks test

    accessd committed Jul 24, 2012
Commits on Jul 23, 2012
  1. Add CHANGELOG entry

    spastorino committed Jul 23, 2012
  2. Remove ActionDispatch::Head middleware in favor of Rack::Head

    spastorino committed Jul 23, 2012
    Closes #7110 there's more work to do on rack-cache issue 69
  3. Merge pull request #7137 from kennyj/fix_installing_problem_journey

    rafaelfranca committed Jul 23, 2012
    Fix build. There is journey-1.0.4 on the 1-0-stable branch.
  4. Bump Journey requirements to 1.0.4

    pixeltrix committed Jul 23, 2012
    There are some Action Pack tests for regressions from 3.1 that require
    a later version of Journey to pass so bump to the current version.
Commits on Jul 22, 2012
  1. Merge pull request #7130 from kennyj/fix_restoring_query_cache

    rafaelfranca committed Jul 22, 2012
    Restore connection_id on error.
  2. Restore connection_id on error.

    kennyj committed Jul 22, 2012
  3. Merge pull request #7123 from nashby/data-in-options

    rafaelfranca committed Jul 22, 2012
    don't escape options in option_html_attributes method
  4. don't escape options in option_html_attributes method

    nashby committed Jul 21, 2012
    we don't need to escape values in this method as we pass
    these html attributes to `tag_options` method that handle escaping as
    well.
    
    it fixes the case when we want to pass html5 data options
Commits on Jul 21, 2012
  1. Merge pull request #7126 from frodsan/fix_nodoc_encoding

    rafaelfranca committed Jul 21, 2012
    fixing :nodoc:s in AS::JSON::Encoding
  2. fixing :nodoc:s in AS::JSON::Encoding

    Francesco Rodriguez committed Jul 21, 2012
  3. Remove deprecation warnings

    Carlos Galdino + Rafael Mendonça França committed Jul 21, 2012
  4. Add back `:disable_with` and change deprecation horizon to 4.1

    Carlos Galdino + Rafael Mendonça França committed Jul 21, 2012
  5. Add back `:confirm` and change deprecation horizon to 4.1

    Carlos Galdino + Rafael Mendonça França committed Jul 21, 2012
  6. minor copy edits [ci skip]

    vijaydev committed Jul 21, 2012
  7. Revert "Make it clear that you can also pass a full url to assert_rou…

    vijaydev committed Jul 21, 2012
    …ting."
    
    This reverts commit 5a6f30f.
  8. Revert "Fix a reference"

    fxn committed Jul 21, 2012
    The sentence itself was not exact, [] and fetch are different. Reverting
    in docrails because it has been reworded in master and 3-2-stable,see
    98f4aee.
    
    This reverts commit 6987966.
  9. copy-edits 9674d2c

    fxn committed Jul 21, 2012
  10. Merge pull request #7100 from shigeya/fix_mime_responds_to_doc

    fxn committed Jul 21, 2012
    Clarification to doc of ActionController::MimeResponse.respond_to