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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    sikachu committed Jun 8, 2011
    …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.
  14. Fix `simple_format` helper to work correctly with the new SafeBuffer …

    sikachu committed Jun 8, 2011
    …rule.
    
    This has been ported from `3-0-stable` [ed37964]
  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'…

    NZKoz committed with tenderlove Jun 7, 2011
    …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
Commits on Jun 7, 2011
  1. When you add a record to a polymorphic has_one, you should be able to…

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

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

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

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

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