Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
branch: engine-routes
Commits on Apr 28, 2012
  1. @romanvbabenko

    Engine#routes? method has been fixed

    romanvbabenko authored committed
  2. Add a failing test for #5764

    authored
  3. @pixeltrix

    Merge session arg with existing session instead of overwriting

    pixeltrix authored
    This may break existing tests that are asserting the whole session contents
    but should not break existing tests that are asserting individual keys - e.g:
    
    class SomeControllerTest < ActionController::TestCase
      setup do
        session['user_id'] = 1
      end
    
      test "some test" do
        get :some_action, nil, { 'another_var' => 2 }
    
        # This assertion will now fail
        assert_equal({ 'another_var' => 2 }, session)
    
        # This assertion will still pass
        assert_equal 2, session['another_var]
      end
    end
    
    Fixes #1529.
  4. @tenderlove

    Merge pull request #6028 from sikachu/master-fix_plpgsql

    tenderlove authored
    Create plpgsql language if not available
  5. @josevalim

    Merge pull request #6035 from carlosantoniodasilva/amo-translation-re…

    josevalim authored
    …factor
    
    Refactor AMo::Translation, avoid changing options in human attr name
  6. @carlosantoniodasilva
  7. @carlosantoniodasilva
  8. @josevalim

    Use Rails::Queueing::Queue instead of Queue so people can build their…

    josevalim authored
    … own consumers around stdlib's Queue
  9. @josevalim
  10. @josevalim

    Merge pull request #6024 from carlosantoniodasilva/amo-dirty-refactor

    josevalim authored
    Improve AMo::Dirty *_will_change! method
  11. @josevalim

    Merge pull request #6029 from aderyabin/fix_depr

    josevalim authored
    removed deprecation warnings
  12. @aderyabin

    removed deprecation warnings

    aderyabin authored
  13. @sikachu

    Create plpgsql language if not available

    sikachu authored
    This should fix the problem in Travis CI server.
    (http://travis-ci.org/#!/rails/rails/jobs/1194988)
  14. @spastorino

    Merge pull request #6026 from sikachu/master-fix_warning

    spastorino authored
    Add parentheses to hide Ruby warning
  15. @sikachu
  16. @carlosantoniodasilva

    Refactor AMo::Errors

    carlosantoniodasilva authored
    * Use merge!, remove reverse_merge
    * Use case statement instead of is_a? checks
Commits on Apr 27, 2012
  1. @carlosantoniodasilva

    Return earlier if attribute already changed in *_will_change! methods

    carlosantoniodasilva authored
    Avoid obtaining the value and duplicating it when possible.
  2. @tenderlove

    Merge pull request #6023 from carlosantoniodasilva/fix-queue-test

    tenderlove authored
    Fix failing test related to TestQueue
  3. @carlosantoniodasilva
  4. @josevalim

    Merge pull request #6021 from sikachu/log_exception

    josevalim authored
    Log the exception from the ThreadConsumer
  5. @sikachu

    Log the exception from the ThreadConsumer

    sikachu authored
    This will make sure you know when there's an exception occur.
  6. @tenderlove
  7. @tenderlove
  8. @tenderlove

    oops!

    tenderlove authored
  9. @tenderlove
  10. @tenderlove

    do not depend on time

    tenderlove authored
  11. @tenderlove

    Merge pull request #6020 from 7even/test_queue_order

    tenderlove authored
    Rails::Queueing::TestQueue run order
  12. @7even

    clean up empty lines

    7even authored
  13. @7even
  14. @vijaydev
  15. @vijaydev
  16. @vijaydev

    update docs - disabling prepared statements is not connected to manag…

    vijaydev authored
    …ing connections externally [ci skip]
  17. @tenderlove
  18. @tenderlove

    Merge pull request #5698 from dougcole/support_postgresql_partitioning

    tenderlove authored
    Support postgresql partitioning by making INSERT RETURNING optional
Something went wrong with that request. Please try again.