Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Apr 29, 2012
  1. @josevalim

    Merge pull request #6006 from carlosantoniodasilva/partial-layout-col…

    josevalim authored
    …lection-item
    
    Partial layout collection item
  2. @jeremy

    Merge pull request #6017 from larzconwell/remove_sanitize_dom_id

    jeremy authored
    Removed the sanitize_dom_id method
  3. @carlosantoniodasilva
  4. @carlosantoniodasilva

    Move layout logic with collection to be handled only with explicit te…

    carlosantoniodasilva authored
    …mplate is given
    
    Layout is never an available option when rendering with the shortcut
    `render @collection`.
  5. @carlosantoniodasilva
  6. @carlosantoniodasilva
  7. @carlosantoniodasilva
  8. @josevalim

    Merge pull request #6057 from jeremyf/remove-deprecation-warning-due-…

    josevalim authored
    …to-reload
    
    Removed extraneous .present? check for AR::Base#reload
  9. @jeremyf
  10. @josevalim

    Merge pull request #6056 from jeremyf/remove-deprecation-warning-due-…

    josevalim authored
    …to-reload
    
    Removed deprecation warning for #find as a result of AR::Base#reload
  11. @jeremyf

    Removed deprecation warning for #find as a result of AR::Base#reload

    jeremyf authored
    Cleaned up "DEPRECATION WARNING: Passing options to #find is
    deprecated. Please build a scope and then call #find on it."
  12. @josevalim

    Merge pull request #6047 from carlosantoniodasilva/changelog-jsonp-mi…

    josevalim authored
    …metype
    
    Add changelog entry for jsonp mimetype change, fix failing test
  13. @carlosantoniodasilva

    Add changelog entry for jsonp mimetype change, fix failing test

    carlosantoniodasilva authored
    Fix failing test: Mime::JS generates "text/javascript"
  14. @vijaydev

    Removed unclear doc in AR querying guide [ci skip]

    vijaydev authored
    The range example used in array conditions is unclear and talks about
    the old 'conditions' option. Closes #4943.
  15. @josevalim

    Merge pull request #6044 from gazay/tests_for_string_truncate_w_regex…

    josevalim authored
    …p_separator
    
    Tests for regexp separator in String#truncate
  16. @gazay
  17. @pixeltrix
  18. @josevalim

    Merge pull request #5986 from carlosantoniodasilva/deprecation-behavi…

    josevalim authored
    …or-silence
    
    Add a "silence" behavior to completely turn off deprecation warnings.
  19. @josevalim
  20. @josevalim

    Merge pull request #2321 from omjokine/master

    josevalim authored
    JSONP should use mimetype application/javascript
  21. @drogus
  22. @jeremy

    Merge pull request #5996 from gazay/remove_excess_selfs

    jeremy authored
    Active Support housekeeping and polish
Commits on Apr 28, 2012
  1. @gazay
  2. @gazay
  3. @gazay

    AS core_ext refactoring pt.2

    gazay authored
  4. @gazay

    AS core_ext refactoring

    gazay authored
  5. Allow Thor 0.15 and 1.0, to be released shortly

    tomhuda authored
  6. @drogus
  7. @drogus
  8. @romanvbabenko @drogus

    Engine#routes? method has been fixed

    romanvbabenko authored drogus committed
  9. @drogus

    Add a failing test for #5764

    drogus authored
  10. @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.
  11. @carlosantoniodasilva
  12. @tenderlove

    Merge pull request #6028 from sikachu/master-fix_plpgsql

    tenderlove authored
    Create plpgsql language if not available
  13. @carlosantoniodasilva

    Document #behavior= and update CHANGELOG

    twinturbo authored carlosantoniodasilva committed
Something went wrong with that request. Please try again.