Fix OrderedHash merging with block given. #1740

Merged
merged 2 commits into from Jun 17, 2011

Conversation

Projects
None yet
5 participants
@Antiarchitect
Contributor

Antiarchitect commented Jun 17, 2011

Code taken from Rails 3 branch. Now OrderedHash merging can accept a block.

@gmile

This comment has been minimized.

Show comment Hide comment
@gmile

gmile Jun 17, 2011

Contributor

Any chances to see tests for this?

Contributor

gmile commented Jun 17, 2011

Any chances to see tests for this?

@Antiarchitect

This comment has been minimized.

Show comment Hide comment
@Antiarchitect

Antiarchitect Jun 17, 2011

Contributor

Delivered!

Contributor

Antiarchitect commented Jun 17, 2011

Delivered!

@vijaydev

This comment has been minimized.

Show comment Hide comment
@vijaydev

vijaydev Jun 17, 2011

Member

I think 2-3-stable is frozen except for security fixes.

Member

vijaydev commented Jun 17, 2011

I think 2-3-stable is frozen except for security fixes.

@Antiarchitect

This comment has been minimized.

Show comment Hide comment
@Antiarchitect

Antiarchitect Jun 17, 2011

Contributor

I've made this fix for the sake of justice and beauty. Yesterday I've spent about 3 hours to understand why my ordered hashes merging doesn't work with block given. So there is ugly hack in my app now.

Contributor

Antiarchitect commented Jun 17, 2011

I've made this fix for the sake of justice and beauty. Yesterday I've spent about 3 hours to understand why my ordered hashes merging doesn't work with block given. So there is ugly hack in my app now.

@dmathieu

This comment has been minimized.

Show comment Hide comment
@dmathieu

dmathieu Jun 17, 2011

Contributor

There won't be any 2.3 release unless it's for security.
So even if your patch were to be merged, you won't see it in action.

You should either monkey patch OrderedHash to fix the problem, or, even better, upgrade to 3.x

Contributor

dmathieu commented Jun 17, 2011

There won't be any 2.3 release unless it's for security.
So even if your patch were to be merged, you won't see it in action.

You should either monkey patch OrderedHash to fix the problem, or, even better, upgrade to 3.x

@Antiarchitect

This comment has been minimized.

Show comment Hide comment
@Antiarchitect

Antiarchitect Jun 17, 2011

Contributor

Yes I know. App is working fine with my hack now. I hope it can save some other's time.

Contributor

Antiarchitect commented Jun 17, 2011

Yes I know. App is working fine with my hack now. I hope it can save some other's time.

josevalim added a commit that referenced this pull request Jun 17, 2011

Merge pull request #1740 from Antiarchitect/2-3-stable
Fix OrderedHash merging with block given.

@josevalim josevalim merged commit 8d02083 into rails:2-3-stable Jun 17, 2011

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