Permalink
Commits on Sep 1, 2011
  1. @tenderlove

    Merge pull request #2775 from jaw6/fix/reverse

    Fixes bug in ActiveRecord::QueryMethods, #1697
    tenderlove committed Sep 1, 2011
  2. @vijaydev

    Merge pull request #2718 from dasch/patch-5

    Split long string into multiple shorter ones
    vijaydev committed Sep 1, 2011
  3. @josevalim

    Merge pull request #2585 from marcgg/fix-ruby19-splitoptions

    In some case ActiveResource fails to handle serialized attributes with Ruby 1.9 and crashes
    josevalim committed Sep 1, 2011
  4. @marcgg

    Do not use objects that don't respond to to_sym (integers, floats, da…

    …tes...) as parameters
    marcgg committed Sep 1, 2011
  5. @josevalim

    Merge pull request #2788 from spohlenz/precompile-without-digests-master

    assets:precompile should not append asset digests when config.assets.digest is false
    josevalim committed Sep 1, 2011
  6. @spohlenz
  7. @josevalim

    Merge pull request #2787 from guilleiguaran/changelogs-3-1-1-master

    Add missing changelog entries for 3.1.1
    josevalim committed Sep 1, 2011
  8. @josevalim

    Merge pull request #2786 from spohlenz/extract-asset-paths-config-master

    Remove explicit references to Rails.application.config from AssetPaths in Sprockets helper
    josevalim committed Sep 1, 2011
  9. @guilleiguaran
  10. @spohlenz
  11. @spastorino

    Merge pull request #2780 from guilleiguaran/assets-pipeline-minor-cha…

    …nges
    
    Assets pipeline: fix in manifest location and remove unused code
    spastorino committed Sep 1, 2011
Commits on Aug 31, 2011
  1. @tenderlove
  2. @fxn
  3. @kirs @fxn

    Instructions for nginx and apache added

    kirs committed with fxn Aug 31, 2011
  4. @rhulse
  5. @leppert
  6. @raybaxter
  7. @fxn
  8. @rhulse

    Add section to pipeline docs to help people upgrading

    These are the options from a brand new app, and
    should help people get it right when upgrading.
    rhulse committed Aug 31, 2011
  9. @jaw6

    Fixes bug in ActiveRecord::QueryMethods, #1697

    Replace split on comma with a regexp that will reverse all ASC/DESC specifically
    jaw6 committed Aug 31, 2011
  10. @josevalim

    Merge pull request #2772 from guilleiguaran/backports-assets-pipeline

    Backports of the assets pipeline changes done in 3-1-stable
    josevalim committed Aug 31, 2011
  11. @anolson
  12. @guilleiguaran
  13. @guilleiguaran
  14. @guilleiguaran

    Backport f443f9c to master

    guilleiguaran committed Aug 31, 2011
  15. @guilleiguaran

    Backport b0f3063 to master

    guilleiguaran committed Aug 31, 2011
  16. @guilleiguaran
  17. @cgriego @josevalim

    Revert "Ruby 1.8.7+ provides to_date/to_datetime, AS just makes them …

    …public." to support date implementations without private to_date/to_datetime on Time (home_run).
    
    This reverts commit 080345b.
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    cgriego committed with josevalim Aug 31, 2011
  18. @guilleiguaran @josevalim
  19. @vijaydev

    Merge pull request #2706 from mitio/doc-changes

    Fixed some typos and made minor text changes in the Plugins guide.
    vijaydev committed Aug 31, 2011
  20. @rosenfeld
  21. @fxn
  22. @semaperepelitsa
  23. @fxn
  24. @fxn

    Merge pull request #2761 from raybaxter/bump_api_url

    don't need edgeapi now that we are on 3.1
    fxn committed Aug 31, 2011