Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jun 12, 2011
  1. @tenderlove

    bumping to rc4

    tenderlove authored
  2. @tenderlove

    Merge branch '3-0-stable' into 3-0-9

    tenderlove authored
    * 3-0-stable:
      Add support for using an ARCONFIG environment variable to specify the location of the config.yml file for running the tests
      Define ActiveSupport#to_param as to_str - closes #1663
      Revert "Make sure that we don't perform in-place mutation on SafeBuffer string"
      Make sure that we don't perform in-place mutation on SafeBuffer string
      Update CHANGELOG to mention the json_escape change
      Ensure number helpers can handle HTML safe strings - closes #1597.
      ensuring that json_escape returns html safe strings when passed an html safe string
      Fix issue #1598 by adding a dependency to the RDoc gem.
      Make sure `escape_javascript` return `SafeBuffer` if the incoming argument is already html_safe
    
    Conflicts:
    	actionpack/CHANGELOG
  3. @jonleighton

    Add support for using an ARCONFIG environment variable to specify the…

    jonleighton authored
    … location of the config.yml file for running the tests
Commits on Jun 9, 2011
  1. @tenderlove
  2. @tenderlove

    bumping to 3.0.9.rc2

    tenderlove authored
Commits on Jun 8, 2011
  1. @tenderlove

    bumping to 3.0.9.rc1

    tenderlove authored
  2. @rsim

    Fix for Oracle adapter to count SELECT queries for assert_queries ass…

    rsim authored
    …ertion
    
    Needed just in 3-0-stable branch, query counting is refactored in 3-1-stable and master branches and do not need this patch anymore.
Commits on Jun 7, 2011
  1. @tenderlove

    Merge branch '3-0-8' into 3-0-stable

    tenderlove authored
    * 3-0-8:
      bumping to 3.0.8
      Do not modify a safe buffer in helpers
      Ensure that the strings returned by SafeBuffer#gsub and friends aren't considered html_safe?
  2. @tenderlove

    bumping to 3.0.8

    tenderlove authored
  3. @tenderlove
Commits on Jun 6, 2011
  1. @tenderlove
  2. @tenderlove
  3. @tenderlove

    more oracle fixes

    tenderlove authored
  4. @tenderlove
  5. @tenderlove
  6. @tenderlove
  7. @tenderlove
  8. @jonleighton
  9. @vijaydev
Commits on Jun 5, 2011
  1. @jonleighton
  2. @jonleighton

    Fix typo

    jonleighton authored
Commits on Jun 4, 2011
  1. @jonleighton
  2. @jonleighton

    Refactor Active Record test connection setup. Please see the RUNNING_…

    jonleighton authored
    …UNIT_TESTS file for details, but essentially you can now configure things in test/config.yml. You can also run tests directly via the command line, e.g. ruby path/to/test.rb (no rake needed, uses default db connection from test/config.yml). This will help us fix the CI by enabling us to isolate the different Rails versions to different databases.
Commits on Jun 2, 2011
  1. @sikachu

    Revert "Fix broken test. You know, the merge button will be the end o…

    sikachu authored
    …f us..."
    
    The fix was intentionaly for this branch, but was applied to another
    branches by mistake. This should fix the CI.
    
    This reverts commit 4c0bed0.
Commits on Jun 1, 2011
  1. @jonleighton
  2. @arunagw

    Adding comment

    arunagw authored
Commits on May 31, 2011
  1. @vatrai
  2. @tenderlove

    Merge pull request #1400 from arunagw/query_cache_test

    tenderlove authored
    Query cache test
  3. @tenderlove
Commits on May 30, 2011
  1. @tenderlove

    bumping to rc3

    tenderlove authored
  2. @tenderlove

    Merge branch '3-0-stable' into 3-0-8

    tenderlove authored
    * 3-0-stable:
      File From Xml is working now. #3-0-stable
      Fixing  XMLMini_JDOM #3-0-stable
      fixing test for mysql2
  3. @arunagw

    Fixed tests for #jruby

    arunagw authored
Commits on May 27, 2011
  1. @sirlantis
  2. @sirlantis

    added regression test

    sirlantis authored
  3. @sirlantis

    Through-association owner's primary key wasn't quoted. Generates inva…

    sirlantis authored
    …lid SQL (id = ) if the record wasn't saved yet (i.e. the primary key's value is nil).
Something went wrong with that request. Please try again.