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

fix stringify_keys destructive behavior for most FormTagHelper functions #2356

Merged
merged 1 commit into from
Aug 4, 2011

Conversation

waynn
Copy link
Contributor

@waynn waynn commented Jul 30, 2011

I've also filed this at #2355

@spastorino
Copy link
Contributor

Please test each method and squash it with your current commit. Thanks :)

@spastorino
Copy link
Contributor

Also add Closes #2355 to your commit message, so github can automatically close it when merged.

@waynn
Copy link
Contributor Author

waynn commented Jul 31, 2011

Sure! So I should just add a test for each of the other two methods that
I've changed, and on that commit, add the phrase "Closes #2355" somewhere in
it?

On Sat, Jul 30, 2011 at 4:00 PM, spastorino <
reply@reply.github.com>wrote:

Also add Closes #2355 to your commit message, so github can automatically
close it when merged.

Reply to this email directly or view it on GitHub:
#2356 (comment)

@spastorino
Copy link
Contributor

yes

@waynn
Copy link
Contributor Author

waynn commented Aug 3, 2011

I've committed a change with three new tests--anything else I should add to it?

@spastorino
Copy link
Contributor

One more thing can you squash your commits into one? Remember to keep the Closes #2355 message

@waynn
Copy link
Contributor Author

waynn commented Aug 4, 2011

Sorry, can you help me with squashing the commits? I followed the guide here: http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html but at the end of it, I had three commits instead of one. Then when I tried rebasing again (thinking it was a merge error), I got this.

Is it because I did a push 3 days ago, so I can't use rebase?

wlue:~/code/rails$ git rebase -i 2b925e8
error: could not apply 9c5c1dd... fix stringify_keys destructive behavior for most FormTagHelper functions
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add ' and run 'git rebase --continue'

Could not apply 9c5c1dd... fix stringify_keys destructive behavior for most FormTagHelper functions

edit: removed sample code

add four new tests to verify that the other three methods that called stringify_keys! are fixed. verified that the tests break in master without the code patch. Closes rails#2355
@waynn
Copy link
Contributor Author

waynn commented Aug 4, 2011

Ah-ha! I think it was because I didn't do git push -f, but instead did a git pull first. Does this currently look correct?

spastorino added a commit that referenced this pull request Aug 4, 2011
fix stringify_keys destructive behavior for most FormTagHelper functions
@spastorino spastorino merged commit cf96649 into rails:master Aug 4, 2011
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

2 participants