Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Branch: async
Commits on Jul 24, 2012
  1. @rafaelfranca
  2. @smartinez87 @rafaelfranca

    New #update_columns method.

    smartinez87 authored rafaelfranca committed
  3. @rafaelfranca

    Merge pull request #7148 from yahonda/address_6195

    rafaelfranca authored
    Addresses ORA-01400 errors and also supports #6115
  4. @rafaelfranca

    Merge pull request #7150 from lucasmazza/flush_option

    rafaelfranca authored
    Replace the flush parameter with a Hash.
  5. @lucasmazza
  6. @yahonda

    This pull requests addresses ORA-01400 errors and also supports #6115

    yahonda authored
    …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.
  7. @rafaelfranca

    Merge pull request #6991 from frodsan/performance_test_generator

    rafaelfranca authored
    update performance test template to use test method
  8. @tenderlove

    Merge branch 'master' into async

    tenderlove authored
    * master: (55 commits)
      fix typo in callbacks test
      Add CHANGELOG entry
      Remove ActionDispatch::Head middleware in favor of Rack::Head
      Fix build. Bump Journey requirements to 2.0.0.
      Bump Journey requirements to 1.0.4
      Add one more test case to make sure that data attributes are being escaped
      Restore connection_id on error.
      don't escape options in option_html_attributes method
      fixing :nodoc:s in AS::JSON::Encoding
      Remove deprecation warnings
      Add back `:disable_with` and change deprecation horizon to 4.1
      Add back `:confirm` and change deprecation horizon to 4.1
      +"foo"+ doesn't generate code tag [ci skip]
      Lets be consistent with whitespaces at documentation
      Copy-edits at Rails::Queueing documentation
      update 4.0 release notes [ci skip]
      improve NullRelation docs [ci skip]
      minor copy edits [ci skip]
      Revert "Make it clear that you can also pass a full url to assert_routing."
      makes a pass over the API of ActiveSupport::HashWithIndifferentAccess
      ...
  9. @spastorino

    Merge pull request #7143 from accessd/fix-typo-callbacks-test

    spastorino authored
    fix typo in validations callbacks test
  10. @accessd

    fix typo in callbacks test

    accessd authored
Commits on Jul 23, 2012
  1. @spastorino

    Add CHANGELOG entry

    spastorino authored
  2. @spastorino

    Remove ActionDispatch::Head middleware in favor of Rack::Head

    spastorino authored
    Closes #7110 there's more work to do on rack-cache issue 69
  3. @rafaelfranca

    Merge pull request #7137 from kennyj/fix_installing_problem_journey

    rafaelfranca authored
    Fix build. There is journey-1.0.4 on the 1-0-stable branch.
  4. @kennyj
  5. @pixeltrix

    Bump Journey requirements to 1.0.4

    pixeltrix authored
    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. @rafaelfranca
  2. @rafaelfranca

    Merge pull request #7130 from kennyj/fix_restoring_query_cache

    rafaelfranca authored
    Restore connection_id on error.
  3. @kennyj

    Restore connection_id on error.

    kennyj authored
  4. @rafaelfranca

    Merge pull request #7123 from nashby/data-in-options

    rafaelfranca authored
    don't escape options in option_html_attributes method
  5. @nashby

    don't escape options in option_html_attributes method

    nashby authored
    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. @rafaelfranca

    Merge pull request #7126 from frodsan/fix_nodoc_encoding

    rafaelfranca authored
    fixing :nodoc:s in AS::JSON::Encoding
  2. fixing :nodoc:s in AS::JSON::Encoding

    Francesco Rodriguez authored
  3. Remove deprecation warnings

    Carlos Galdino + Rafael Mendonça França authored
  4. Add back `:disable_with` and change deprecation horizon to 4.1

    Carlos Galdino + Rafael Mendonça França authored
  5. Add back `:confirm` and change deprecation horizon to 4.1

    Carlos Galdino + Rafael Mendonça França authored
  6. @rafaelfranca
  7. @rafaelfranca
  8. @rafaelfranca
  9. @vijaydev
  10. @vijaydev
  11. @vijaydev
  12. @vijaydev

    minor copy edits [ci skip]

    vijaydev authored
  13. @vijaydev
  14. @fxn
  15. @fxn

    Revert "Fix a reference"

    fxn authored
    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.
Something went wrong with that request. Please try again.