Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Missed commits from 3-2-stable #5359

Merged
merged 3 commits into from Mar 29, 2012
Merged

Missed commits from 3-2-stable #5359

merged 3 commits into from Mar 29, 2012

Conversation

avakhov
Copy link
Contributor

@avakhov avakhov commented Mar 9, 2012

By accident I found that commit f29b4a0 (Add a test case for layout nil) exists only in 3-2-stable branch. I wrote simple script and compare commits between master & 3-2-stable.
It likes that at least these 4 changes are committed only in 3.2 but missed in master.
@josevalim, @carlosantoniodasilva, @bsodmike, they are really missed, aren't they?

@carlosantoniodasilva
Copy link
Member

@avakhov hey.. my commit about missing Array#wrap require is only for 3-2 actually, master is not using this wrap method anymore, so no need to merge it.

About the others, I really don't know, but seems that there is no harm on merging them. Thanks!

@avakhov
Copy link
Contributor Author

avakhov commented Mar 10, 2012

@carlosantoniodasilva sure, I see it. Remove this commit and rebase.

@bsodmike
Copy link
Contributor

@avakhov @josevalim thanks chaps!

@spastorino
Copy link
Contributor

Any news on this one?

@avakhov
Copy link
Contributor Author

avakhov commented Mar 28, 2012

@spastorino I don't now. I rebased to keep them in fit.

spastorino added a commit that referenced this pull request Mar 29, 2012
@spastorino spastorino merged commit c4d90e4 into rails:master Mar 29, 2012
@jeremy
Copy link
Member

jeremy commented Mar 29, 2012

Thank you @avakhov !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants