Fix build for branch 3-0-stable #5565
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also skip persistente tests related to UPDATE + ORDER BY for postgresql PostgreSQL does not support updates with order by, and these tests are failing randomly depending on the fixture loading order now. Conflicts: activerecord/test/cases/associations/join_model_test.rb activerecord/test/cases/associations/nested_through_associations_test.rb activerecord/test/cases/clone_test.rb activerecord/test/cases/dup_test.rb activerecord/test/cases/relations_test.rb activerecord/test/cases/yaml_serialization_test.rb
josevalim
added a commit
that referenced
this pull request
Mar 23, 2012
Fix build for branch 3-0-stable
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-picked 1 commit from 3-2 - with conflicts - and added some specific fixes for 3-0. Please check #5557 and #5558 for detailed info.