fix https://github.com/rails/rails/issues/2947 (with testcase) #2986

Closed
wants to merge 1,125 commits into
from

Conversation

Projects
None yet
Contributor

kennyj commented Sep 12, 2011

No description provided.

vijaydev and others added some commits Aug 14, 2011

Fixed mistakes in layouts/rendering guide about yield
yield(:unspecified_block) actually returns true even if :unspecified_block never
exists. This means you can't use the form yield(:unspecified_block) or yield.
Use lazy load hooks to set parameter wrapping configuration. This mea…
…ns that it doesn't force Action Controller / Active Record to load, but it doesn't fail if they have already loaded. Thanks @josevalim for the hint.
Tags with invalid names should also be stripped in order to prevent
XSS attacks.  Thanks Sascha Depold for the report.
minor details revised in a gsub
Regexps have a construct to express alternation of characters, which
is character classes. In addition to being the most specific idiom to
write this pattern, it reads better without the backslashes. Also, it
is better not to use a capture if none is needed. As a side-effect of
these changes, the gsub is marginally faster, but speed is not the
point of this commit.
Revert "Deprecate the use of non-public methods by Module#delegate"
This reverts commit aa1d1e4.

Conflicts:

	activesupport/lib/active_support/core_ext/module/delegation.rb
	activesupport/test/core_ext/module_test.rb
Revert "Deprecate the use of non-public methods by Module#delegate"
This reverts commit aa1d1e4.

Conflicts:

	activesupport/lib/active_support/core_ext/module/delegation.rb
	activesupport/test/core_ext/module_test.rb
Merge pull request #2581 from guilleiguaran/debug-assets-in-dev
Debug assets by default in development and test environments
Merge pull request #2581 from guilleiguaran/debug-assets-in-dev
Debug assets by default in development and test environments
Merge pull request #2603 from vijaydev/guides
Minor change in the 3.1 release notes
Merge pull request #2603 from vijaydev/guides
Minor change in the 3.1 release notes
Merge pull request #2602 from ernie/fix_predicate_builder_primary_key…
…_assumption

Fix assumption of primary key name in PredicateBuilder subquery.
Merge pull request #2604 from vijaydev/params_wrapper_docs
Minor edit in the params wrapper api docs
Merge pull request #2604 from vijaydev/params_wrapper_docs
Minor edit in the params wrapper api docs
Merge pull request #2597 from dharmatech/patch-2
actionpack/lib/action_controller/base.rb: docs typo
Merge pull request #2595 from smartinez87/assets-guide
Document debugging assets set by default for dev and test envs on guides
Merge pull request #2596 from dharmatech/patch-1
ActionController::Redirecting : fix docs typo
Merge pull request #2597 from dharmatech/patch-2
actionpack/lib/action_controller/base.rb: docs typo
Merge pull request #2595 from smartinez87/assets-guide
Document debugging assets set by default for dev and test envs on guides
Merge pull request #2596 from dharmatech/patch-1
ActionController::Redirecting : fix docs typo
Merge pull request #2615 from cesario/cherry_picks_on_rc6
Cherry picked "remove extra space since comment_if already returns the space." on rc6, already apply on master.
Merge pull request #2615 from cesario/cherry_picks_on_rc6
Cherry picked "remove extra space since comment_if already returns the space." on rc6, already apply on master.
Merge pull request #2620 from cesario/3-1-0
Fix CI and rename 1 misleading test case.
Merge pull request #2620 from cesario/3-1-0
Fix CI and rename 1 misleading test case.
Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251
Use mysql_creation_options inside rescue block
Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251
Use mysql_creation_options inside rescue block

arunagw and others added some commits Sep 3, 2011

We need to check here for the table name.
Abstract classes are having nil class name.
So nil.gsub will give a error here.
Merge pull request #2831 from arunagw/pg_abstract_class_fix
Fixed test for 3-1-stable. Abstract class is having nil class name.
Merge pull request #2829 from arunagw/pg_min_fix
pg does not allow aliases in the having clause, but functions are fine
Merge pull request #2825 from guilleiguaran/bcrypt-ruby-comments
Add comments about bcrypt-ruby gem to SecurePassword and add it to default Gemfile
Merge pull request #2826 from guilleiguaran/changelog-remove-bcrypt
Changelog entry about remove of bcrypt as hard dependency on ActiveModel
Merge pull request #2835 from guilleiguaran/actionpack-changelog
Include ticket numbers in AP CHANGELOG
restores the API docs of AR::Fixtures, made a quick pass over them, r…
…evises link in fixture template [closes #2840]

Conflicts:

	activerecord/lib/active_record/fixtures.rb
Warnings removed for unused variables.
Warnings removed for using shadow variable.
Modified content in guides and comments
for "assert /" warnings.
Removed because if somebody will use this code 
they will get warnings!
Merge pull request #2843 from arunagw/warnings_removed_for_test_3-1-s…
…table

Warnings removed for test 3 1 stable
We can't simply check the first line of the
backtrace, because JRuby reports the call 
to __send__ in the backtrace.

In JRuby first is "org/jruby/RubyKernel.java"
Merge pull request #2849 from arunagw/jruby_activesupport_fix_3-1-stable
Jruby activesupport fix 3 1 stable for JRuby
Merge pull request #2860 from guilleiguaran/fix-assets-behavior
Fix AssetNotPrecompiledError behavior
Merge pull request #2861 from guilleiguaran/assets-fix-changelog
Add entry about Asset behaviour fix to ActionPack ChangeLog
Merge pull request #2799 from tomstuart/3-1-stable
Never return stored content from content_for when a block is given
Merge pull request #2873 from guilleiguaran/remove-unused-config
Remove unused config variable from test.rb template
Make `ActiveSupport::OrderedHash` extractable when using `Array#extra…
…ct_options!`

`ActiveSupport::OrderedHash` is actually a subclass of the hash, so it does make sense that it should be extractable from the array list.
Merge pull request #2874 from sikachu/3-1-stable-extractable_ordered_…
…hash

Make `ActiveSupport::OrderedHash` extractable when using `Array#extract_options!`
Merge pull request #2716 from jbbarth/fix_invert_rename_index
Fix bad options order in AR::Migration::CommandRecorder#invert_rename_index
Member

jonleighton commented on 78c896c Sep 6, 2011

common, CHANGELOG :) 431d766

jonleighton and others added some commits Sep 6, 2011

Disable active record marshalling tests on Ruby 1.8.7 on Travis CI, a…
…s they have been failing intermittently for a long while due to what appears to be a Ruby bug. If anyone has the skills/expertise/time to debug this, please speak to the Travis guys.
Use broken YAML that will fail with Syck as well as Psych. Fixes test…
…_broken_yaml_exception in fixtures_test.rb on Ruby 1.8.7.
Member

jonleighton commented on b8d4692 Sep 6, 2011

@tenderlove please confirm this looks ok to you.

This is on 3-1-stable. On 1.8.7 the YAML wasn't "broken" enough to raise an error. For some reason the same failure was not present on master - are we forcing Psych there or something, even for 1.8.7?

Owner

tenderlove replied Sep 6, 2011

Ya, looks fine. No, we shouldn't be using psych on 1.8, only 1.9. I was trying to figure out YAML that would break on both and in 1.8. Guess I failed. :(

Member

jonleighton replied Sep 6, 2011

So any idea why it was not failing on master + ruby 1.8.7?

Owner

tenderlove replied Sep 6, 2011

jonleighton and others added some commits Sep 6, 2011

Ensure we are not comparing a string with a symbol in HasManyAssociat…
…ion#inverse_updates_counter_cache?. Fixes #2755, where a counter cache could be decremented twice as far as it was supposed to be.
Nested through associations: preloads from the default scope of a thr…
…ough model should not be included in the association scope. (We're already excluding includes.) Fixes #2834.
Merge pull request #2889 from guilleiguaran/perform-caching-assets
config.action_controller.perform_caching isn't used anymore in asset pipeline
Merge pull request #2577 from rails-noob/master
Fix double slash at start of paths when mounting an engine at the root.
Contributor

kennyj commented Sep 12, 2011

sorry, miss operation.

@kennyj kennyj closed this Sep 12, 2011

Member

arunagw commented Sep 12, 2011

@kennyj Wrong pull request! You have included 250+ commits. Please open with appropriate branch

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment