Permalink
Commits on Feb 9, 2012
  1. Allow to set custom console type with Rails.application.config.console=

    This patch adds ability to set custom console if you want to use
    something other than IRB. Previously the hack that people used
    was:
    
        silence_warnings do
          require 'pry'
          IRB = Pry
        end
    
    which is not the best way to customize things.
    committed Feb 1, 2012
  2. @vijaydev

    Merge pull request #4959 from ram123naresh/removed_ordered_hash

    Replaced OrderedHash with Hash for ruby 1.9 series
    vijaydev committed Feb 9, 2012
  3. @ram123naresh
  4. @fxn

    Merge pull request #4957 from ganeshkumar/order_hash_change

    replacing the orderhash with hash for ruby-1.9
    fxn committed Feb 9, 2012
  5. @fxn

    Merge pull request #4958 from ganeshkumar/order_hash_require

    removed unnecessary code
    fxn committed Feb 9, 2012
  6. removed unnecessary code

    ganesh committed Feb 9, 2012
  7. replacing the orderhash with hash for ruby-1.9

    ganesh committed Feb 9, 2012
Commits on Feb 8, 2012
  1. @vijaydev

    Merge pull request #4950 from ask4prasath/text_changes

    Test title changed corresponding to the test
    vijaydev committed Feb 8, 2012
  2. test title changed corresponding to the test

    prasath committed Feb 8, 2012
  3. @fxn

    Merge pull request #4949 from ask4prasath/ordered_hash_replacement_ac…

    …tiveresource
    
    replaced active support ordered hash to ruby hash on active resource
    fxn committed Feb 8, 2012
  4. @tenderlove

    Merge pull request #4947 from rafaelfranca/fix-build

    PostgreSQL does not work in the same way of the other adapters
    tenderlove committed Feb 8, 2012
  5. @rafaelfranca
  6. @tenderlove

    Merge pull request #4930 from ask4prasath/ordered_hash_replaced

    Replacing ordered hash to ruby hash on active model
    tenderlove committed Feb 8, 2012
  7. @josevalim

    Merge pull request #4942 from bogdan/pluck_joins

    AR::Relation#pluck: improve to work with joins
    josevalim committed Feb 8, 2012
  8. @bogdan
  9. @spastorino

    Merge pull request #4934 from rafaelfranca/fix-doc

    Fix match docs
    spastorino committed Feb 8, 2012
  10. @rafaelfranca

    Fix match docs

    rafaelfranca committed Feb 8, 2012
Commits on Feb 7, 2012
  1. @jonleighton
  2. @josevalim

    Merge pull request #4932 from carlosantoniodasilva/fix-request-test

    Fix failing request test
    josevalim committed Feb 7, 2012
  3. @carlosantoniodasilva

    Fix failing request test

    Latest changes in remote ip handling conflicted with each other in
    tests. Related:
    
    dd09811
    6a72022
    carlosantoniodasilva committed Feb 7, 2012
  4. @josevalim
  5. @josevalim
  6. @fxn

    Merge pull request #4878 from vijaydev/ordinal-2072

    PR #2072 with docs
    fxn committed Feb 7, 2012
  7. @tenderlove
  8. @fxn

    no need to check for this constant

    fxn committed Feb 7, 2012
  9. replacing ordered hash to ruby hash

    prasath committed Feb 7, 2012
  10. @josevalim

    Merge pull request #4928 from rmm5t/fix_force_ssl_redirect_with_param…

    …s_master
    
    Fix force_ssl redirect with params
    josevalim committed Feb 7, 2012
  11. @rmm5t

    Added unit test to cover changes to RouteSet.url_for

    ActionDispatch::Routing::RouteSet.url_for now handles passing params through to
    ActionDispatch::Http::Url.url_for
    
    Conflicts:
    
    	actionpack/test/controller/base_test.rb
    rmm5t committed Feb 7, 2012
  12. @rmm5t

    Fixed force_ssl redirects to include original query params

    `ActionController.force_ssl` redirects http URLs to their https equivalent;
    however, when a URL contains a query string, the resulting redirect lacked the
    original query string.
    
    Conflicts:
    
    	actionpack/lib/action_controller/metal/force_ssl.rb
    rmm5t committed Feb 6, 2012
  13. @josevalim

    Merge pull request #2490 from gsterndale/x_forwarded_for_order

    The first IP address in the X-Forwarded-For header is the originating IP
    josevalim committed Feb 7, 2012
  14. @jeremy

    Fix that failed tests should exit with a nonzero error code.

    Partially reverts 14c89e7.
    
    Hat tip to @tenderlove for paring down the TestTask!
    jeremy committed Feb 7, 2012
  15. @gsterndale