Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Tag: v3.1.0.rc4
Commits on Jun 9, 2011
  1. @tenderlove

    bumping to 3.1.0.rc4

    tenderlove authored
  2. @tenderlove
  3. @dmathieu @tenderlove
  4. @chopmo @tenderlove

    Fix issue #1598 by adding a dependency to the RDoc gem.

    chopmo authored tenderlove committed
  5. @tenderlove

    Merge pull request #1610 from sikachu/3-1-stable-javascript

    tenderlove authored
    Make sure `escape_javascript` return `SafeBuffer` if the incoming argumen
  6. @sikachu

    Make sure `escape_javascript` return `SafeBuffer` if the incoming arg…

    sikachu authored
    …ument is already html_safe
Commits on Jun 8, 2011
  1. @dhh
  2. @dhh

    If you set a js_compressor, it means that you want shit compressed --…

    dhh authored
    … we dont need a second option to turn that on
  3. @tenderlove

    bumping to 3.1.0.rc3

    tenderlove authored
  4. @fx @pixeltrix

    use association_primary_key in AssociationScope#add_constraints

    fx authored pixeltrix committed
    (cherry picked from commit 1f7c3d0)
  5. @tenderlove

    Merge pull request #1566 from sikachu/3-1-stable-changelog

    tenderlove authored
    Update CHANGELOG to mention the new SafeBuffer change
  6. @bhavinkamani @pixeltrix

    fix connection not established error while running rake task

    bhavinkamani authored pixeltrix committed
    db:schema:dump
    (cherry picked from commit e9a2ff8)
  7. @sikachu
  8. @josevalim

    Merge pull request #1562 from sikachu/3-1-i18n-convention

    josevalim authored
    Brought back alternative convention for namespaced models in i18n.
  9. @thoefer2 @sikachu
  10. @josevalim

    Merge pull request #1561 from sikachu/3-1-escapejs

    josevalim authored
    Make escape_javascript happy to handle SafeBuffers
  11. @tardate @sikachu

    Make escape_javascript happy to handle SafeBuffers

    tardate authored sikachu committed
    * see GH#1553
    * allow for the fact that gsub on SafeBuffer does not pass match variables $1, $2 etc to a block
  12. @josevalim

    Merge pull request #1557 from guilleiguaran/multiple-sources-sprocket…

    josevalim authored
    …s-3-1
    
    Multiple sources in sprockets helpers (backported from master)
  13. @guilleiguaran
  14. @rsim @fxn

    Do not hardcode :id as it was ignored by mass assignment filter

    rsim authored fxn committed
    As a result test was failing on Oracle where ids are assigned by default from 1000
  15. @josevalim

    Merge pull request #1546 from sikachu/31safebuffer

    josevalim authored
    Fix failing ActionPack tests on 3-1-stable
  16. @sikachu

    Add proper fix to `mail_to` helper.

    sikachu authored
    * Fix the problem on manipulating on the `ActiveSupport::SafeBuffer`
    * Make sure that we run `escape_javascript` on the `String`, to avoid unexpected behavior.
  17. @sikachu

    Adapt [823aa22] to make sure we perform cloning before manipulation o…

    sikachu authored
    …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.
  18. @sikachu

    Fix `simple_format` helper to work correctly with the new SafeBuffer …

    sikachu authored
    …rule.
    
    This has been ported from `3-0-stable` [ed37964]
  19. @cmeiklejohn @sikachu

    Fragment caching needs to operate on the pure output, not the

    cmeiklejohn authored sikachu committed
    safebuffer.
  20. @tenderlove

    bumping to rails 3.1.0.rc2

    tenderlove authored
  21. @NZKoz @tenderlove

    Ensure that the strings returned by SafeBuffer#gsub and friends aren'…

    NZKoz authored tenderlove committed
    …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. @jonleighton

    When you add a record to a polymorphic has_one, you should be able to…

    jonleighton authored
    … access the owner from the associated record
  2. @jonleighton

    Allow polymorphic has_one to work when the association is set before …

    jonleighton authored
    …the owner has been saved. Fixes #1524.
  3. @vijaydev @fxn

    fix spacing

    vijaydev authored fxn committed
    Conflicts:
    
    	railties/guides/source/configuring.textile
  4. @vijaydev @fxn

    add missing generator configs

    vijaydev authored fxn committed
  5. @vijaydev @fxn

    proof reading and fixes in configuring guide

    vijaydev authored fxn committed
  6. @vijaydev @fxn

    fix indents and a code error in caching guide

    vijaydev authored fxn committed
  7. @fxn
  8. @fxn

    sprockets gzips assets now

    fxn authored
    Conflicts:
    
    	railties/lib/rails/tasks/assets.rake
Something went wrong with that request. Please try again.