Permalink
Commits on Jun 9, 2011
  1. bumping to 3.1.0.rc4

    tenderlove committed Jun 9, 2011
  2. Merge pull request #1610 from sikachu/3-1-stable-javascript

    Make sure `escape_javascript` return `SafeBuffer` if the incoming argumen
    tenderlove committed Jun 9, 2011
  3. Make sure `escape_javascript` return `SafeBuffer` if the incoming arg…

    …ument is already html_safe
    sikachu committed Jun 9, 2011
Commits on Jun 8, 2011
  1. If you set a js_compressor, it means that you want shit compressed --…

    … we dont need a second option to turn that on
    dhh committed Jun 8, 2011
  2. bumping to 3.1.0.rc3

    tenderlove committed Jun 8, 2011
  3. use association_primary_key in AssociationScope#add_constraints

    (cherry picked from commit 1f7c3d0)
    fx committed with pixeltrix May 26, 2011
  4. Merge pull request #1566 from sikachu/3-1-stable-changelog

    Update CHANGELOG to mention the new SafeBuffer change
    tenderlove committed Jun 8, 2011
  5. fix connection not established error while running rake task

    db:schema:dump
    (cherry picked from commit e9a2ff8)
    bhavinkamani committed with pixeltrix May 21, 2011
  6. Merge pull request #1562 from sikachu/3-1-i18n-convention

    Brought back alternative convention for namespaced models in i18n.
    josevalim committed Jun 8, 2011
  7. Merge pull request #1561 from sikachu/3-1-escapejs

    Make escape_javascript happy to handle SafeBuffers
    josevalim committed Jun 8, 2011
  8. Make escape_javascript happy to handle SafeBuffers

    * see GH#1553
    * allow for the fact that gsub on SafeBuffer does not pass match variables $1, $2 etc to a block
    tardate committed with sikachu Jun 8, 2011
  9. Merge pull request #1557 from guilleiguaran/multiple-sources-sprocket…

    …s-3-1
    
    Multiple sources in sprockets helpers (backported from master)
    josevalim committed Jun 8, 2011
  10. Do not hardcode :id as it was ignored by mass assignment filter

    As a result test was failing on Oracle where ids are assigned by default from 1000
    rsim committed with fxn Jun 8, 2011
  11. Merge pull request #1546 from sikachu/31safebuffer

    Fix failing ActionPack tests on 3-1-stable
    josevalim committed Jun 8, 2011
  12. Add proper fix to `mail_to` helper.

    * Fix the problem on manipulating on the `ActiveSupport::SafeBuffer`
    * Make sure that we run `escape_javascript` on the `String`, to avoid unexpected behavior.
    sikachu committed Jun 8, 2011
  13. Adapt [823aa22] to make sure we perform cloning before manipulation o…

    …nly on `OutputBuffer`.
    
    After the fragment rendering, `Builder` returns the `String` object instead of `ActionView::OutputBuffer`. Somehow the same procedure which was in [823aa22] does not play nice with the String, and result in the fragment got lost.
    sikachu committed Jun 8, 2011
  14. Fix `simple_format` helper to work correctly with the new SafeBuffer …

    …rule.
    
    This has been ported from `3-0-stable` [ed37964]
    sikachu committed Jun 8, 2011
  15. bumping to rails 3.1.0.rc2

    tenderlove committed Jun 7, 2011
  16. Ensure that the strings returned by SafeBuffer#gsub and friends aren'…

    …t considered html_safe?
    
    Also make sure that the versions of those methods which modify a string in place such as gsub! can't be called on safe buffers at all.
    
    Conflicts:
    
    	activesupport/test/safe_buffer_test.rb
    NZKoz committed with tenderlove Jun 7, 2011
Commits on Jun 7, 2011
  1. When you add a record to a polymorphic has_one, you should be able to…

    … access the owner from the associated record
    jonleighton committed Jun 7, 2011
  2. Allow polymorphic has_one to work when the association is set before …

    …the owner has been saved. Fixes #1524.
    jonleighton committed Jun 7, 2011
  3. fix spacing

    Conflicts:
    
    	railties/guides/source/configuring.textile
    vijaydev committed with fxn Jun 7, 2011
  4. add missing generator configs

    vijaydev committed with fxn Jun 7, 2011
  5. sprockets gzips assets now

    Conflicts:
    
    	railties/lib/rails/tasks/assets.rake
    fxn committed Jun 7, 2011