Skip to content
Commits on Feb 27, 2013
  1. @steveklabnik
  2. @steveklabnik
  3. @steveklabnik

    Tighten up AS.gemspec.

    steveklabnik committed Feb 26, 2013
    Apparently 0.6.2 has a call to force_encoding, which is not around
    in 1.8.7.
  4. @steveklabnik

    CHANGELOG entry for ee291b9.

    steveklabnik committed Feb 26, 2013
    Since we released it, it should go in the CHANGELOG.
  5. @steveklabnik

    Revert "Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-nu…

    steveklabnik committed Feb 26, 2013
    …meric"
    
    This reverts commit 921a296.
Commits on Feb 26, 2013
  1. @yaotti @steveklabnik
  2. @carlosantoniodasilva
  3. @carlosantoniodasilva

    Merge pull request #9430 from authorNari/backport-7072-to-3-2-stable

    carlosantoniodasilva committed Feb 26, 2013
    Backported #7072 to 3-2-stable. Use database value for uniqueness validation scope
  4. @authorNari
Commits on Feb 25, 2013
  1. @rafaelfranca

    Merge pull request #9408 from mikeycgto/origin/3-2-stable

    rafaelfranca committed Feb 24, 2013
    Update RUBY_VERSION check for performance testing to handle 2.0.0
  2. @mikeycgto
Commits on Feb 24, 2013
  1. @rafaelfranca

    Merge pull request #9406 from rails/3-2-stable-ruby-2

    rafaelfranca committed Feb 24, 2013
    Rails 3.2.x is now compatible with Ruby 2.0.0
  2. @sikachu
  3. @hsbt @sikachu

    added marshal_load and marshal_dump for ProxyTestResult. Behavior of …

    hsbt committed with sikachu Dec 29, 2012
    …method_missing with Marshal.dump and Marshal.load is changing in ruby 2.0.0 later.
  4. @sikachu

    Do not redirect cache logger to /dev/null in test

    sikachu committed Feb 22, 2013
    For some reason, redirecting cache's logger to '/dev/null' resulting in
    a test failures and LoadError. I think it's because of Thread issue.
    Instead of trying to make every logger threadsafe for Rails 3.2, I think
    it's better to just don't set the logger for now.
    
    (Note: resetting the logger back to original value in the teardown block
    didn't fix the problem.)
  5. @jeremy @sikachu

    Ruby 2 compat. Hash[] now raises on bad elements rather than ignoring…

    jeremy committed with sikachu Oct 6, 2012
    … them. No sense over-testing this MRI-specific behavior. See ruby/ruby@8d6add9
  6. @rafaelfranca @sikachu
  7. @sikachu

    Check for `method_missing` in public and protected

    sikachu committed Feb 22, 2013
    Ruby 2.0 changed the behavior of `respond_to?` without argument to
    return only search for public method. We actually want to perform the
    action only if `method_missing` is either in public or protected.
  8. @thedarkone @sikachu
  9. @jeremy @sikachu

    Ruby 2 compat. CGI.escapeHTML has changed the way it escapes apostrop…

    jeremy committed with sikachu Oct 6, 2012
    …hes a few times, so fix up the test to work with however it chooses to escape.
  10. @tenderlove @sikachu

    Ruby 2.0.0 defaults source encoding to utf-8 so we need to specifical…

    tenderlove committed with sikachu Nov 12, 2012
    …ly tag this file with us-ascii
  11. @tenderlove @sikachu
  12. @sikachu

    Define #inspect instead of #to_s

    sikachu committed Feb 21, 2013
    Ruby 2.0 Object#inspect does not call #to_s by default anymore.
  13. @sikachu
  14. @tenderlove @sikachu

    `name` should be public.

    tenderlove committed with sikachu May 24, 2012
  15. @sikachu

    Add in missing requires

    sikachu committed Feb 21, 2013
Commits on Feb 23, 2013
  1. @carlosantoniodasilva

    Merge pull request #9388 from senny/9367_wrong_schema_after_remove_co…

    carlosantoniodasilva committed Feb 23, 2013
    …lumn
    
    Sqlite preserves primary keys when copying/altering tables.
  2. @senny

    Sqlite preserves primary keys when copying/altering tables.

    senny committed Feb 23, 2013
    Backport #2312.
    Fixes #9367.
    
    I also added a test-case to make sure that renaming or removing
    a column preserves the primary key.
Commits on Feb 22, 2013
  1. @carlosantoniodasilva

    Use 1.8 hash style

    carlosantoniodasilva committed Feb 22, 2013
  2. @pixeltrix

    Merge pull request #9374 from senny/improved_match_shorthand_syntax

    pixeltrix committed Feb 22, 2013
    determine the match shorthand target early.
  3. @senny

    determine the match shorthand target early.

    senny committed Feb 21, 2013
    Backport #9361.
    Closes #7554.
    
    This patch determines the `controller#action` directly
    in the `match` method when the shorthand syntax is used.
    this prevents problems with namespaces and scopes.
Commits on Feb 21, 2013
  1. @carlosantoniodasilva
  2. @rafaelfranca
Commits on Feb 19, 2013
  1. @rafaelfranca

    Merge pull request #9323 from senny/build_fix_from_9252

    rafaelfranca committed Feb 19, 2013
    keep the build :green_heart:, #first on 1.8.7 and pg is different
  2. @senny

    keep the build :green_heart:, #first on 1.8.7 and pg is different

    senny committed Feb 19, 2013
    The build only failed for ruby-1.8.7 and pg. The problem was that the statement:
    
    ```ruby
    author = Author.includes(:comments_with_order_and_conditions, :posts).first
    ```
    
    resulted in Author with ID 2 where on all other rubies / db-engines Author with ID 1
    was retunred. Of course this breaks the assertions.
Something went wrong with that request. Please try again.