1. mirror
  2. rails

Commits

Show all
Author Commit Message Date Builds
tenderlove
bumping to 3.1.0.rc4
Tags
v3.1.0.rc4
Branches
3 branches
tenderlove
ensuring that json_escape returns html safe strings when passed an html safe string
Branches
3 branches
Damien MATHIEU
don't reinitialize the arel_table unless the table_name changes
Branches
3 branches
chopmo
Fix issue #1598 by adding a dependency to the RDoc gem.
Branches
3 branches
tenderlove
Merge pull request #1610 from sikachu/3-1-stable-javascript Make sure `escape_javascript` return `SafeBuffer` if the incoming argumen
Branches
3 branches
Prem Sichanugrist
Make sure `escape_javascript` return `SafeBuffer` if the incoming argument is already html_safe
Branches
3 branches
David Heinemeier Hansson
Indention style + whitespace for readability
Branches
3 branches
David Heinemeier Hansson
If you set a js_compressor, it means that you want shit compressed -- we dont need a second option to turn that on
Branches
3 branches
tenderlove
bumping to 3.1.0.rc3
Tags
v3.1.0.rc3
Branches
3 branches
Marian Rudzynski
use association_primary_key in AssociationScope#add_constraints (cherry picked from commit 1f7c3d02645c6b72e5d1428bc7da6668cdee5fa8)
Branches
3 branches
tenderlove
Merge pull request #1566 from sikachu/3-1-stable-changelog Update CHANGELOG to mention the new SafeBuffer change
Branches
3 branches
Bhavin Kamani
fix connection not established error while running rake task db:schema:dump (cherry picked from commit e9a2ff8bb7fbc81c35bc6c725d7cf6cb52c53f5a)
Branches
3 branches
Prem Sichanugrist
Update CHANGELOG to mention the new SafeBuffer change
Branches
3 branches
José Valim
Merge pull request #1562 from sikachu/3-1-i18n-convention Brought back alternative convention for namespaced models in i18n.
Branches
3 branches
thoefer
Brought back alternative convention for namespaced models in i18n.
Branches
3 branches
José Valim
Merge pull request #1561 from sikachu/3-1-escapejs Make escape_javascript happy to handle SafeBuffers
Branches
3 branches
Paul Gallagher
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
Branches
3 branches
José Valim
Merge pull request #1557 from guilleiguaran/multiple-sources-sprockets-3-1 Multiple sources in sprockets helpers (backported from master)
Branches
3 branches
Guillermo Iguaran
Allow multiple sources in Sprockets helpers
Branches
3 branches
rsim
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
Branches
3 branches
José Valim
Merge pull request #1546 from sikachu/31safebuffer Fix failing ActionPack tests on 3-1-stable
Branches
3 branches
Prem Sichanugrist
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.
Branches
3 branches
Prem Sichanugrist
Adapt [823aa223efbac6ad4d31ea33402892267bb77cb4] to make sure we perform cloning before manipulation only on `OutputBuffer`. After the fragment rendering, `Builder` returns the `String` object instead of `ActionView::OutputBuffer`. Somehow the same procedure which was in [823aa223efbac6ad4d31ea33402892267bb77cb4] does not play nice with the String, and result in the fragment got lost.
Branches
3 branches
Prem Sichanugrist
Fix `simple_format` helper to work correctly with the new SafeBuffer rule. This has been ported from `3-0-stable` [ed3796434af6069ced6a641293cf88eef3b284da]
Branches
3 branches
Christopher Meiklejohn
Fragment caching needs to operate on the pure output, not the safebuffer.
Branches
3 branches
tenderlove
bumping to rails 3.1.0.rc2
Branches
3 branches
Michael Koziarski
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
Branches
3 branches
Jon Leighton
When you add a record to a polymorphic has_one, you should be able to access the owner from the associated record
Branches
3 branches
Jon Leighton
Allow polymorphic has_one to work when the association is set before the owner has been saved. Fixes #1524.
Branches
3 branches
Vijay Dev
fix spacing Conflicts: railties/guides/source/configuring.textile
Branches
3 branches
  1. Prev
  2. Next