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

Make sure that JSON arrays as columns working #14685

Closed
wants to merge 1 commit into from

Conversation

scuxiayiqian
Copy link

@scuxiayiqian scuxiayiqian changed the title Making Make sure that JSON arrays as columns working Apr 10, 2014
@matthewd matthewd self-assigned this Apr 10, 2014
@sikachu
Copy link
Member

sikachu commented Apr 18, 2014

Would you mind squashing your commits down to single commit?

@senny would you mind reviewing this patch?

@matthewd
Copy link
Member

Oh right, sorry, I hadn't commented here... this is still in progress.

@robin850
Copy link
Member

@scuxiayiqian : If you want, you can run the following outside of your rails clone:

$ git clone https://github.com/robin850/rails -b scuxiayiqian
$ git -m scuxiayiqian master
$ git remote rm origin
$ git remote add origin https://github.com/scuxiayiqian/rails
$ git push -f origin master

The rebase process is available on the contributing guide. Also this can be hard to rebase against the master branch ; it's generally a good practice to create a topic branch. Thanks for your contribution anyway! :-)

@arunagw
Copy link
Member

arunagw commented May 2, 2014

@scuxiayiqian did you get time to fix this big list of commits? And fix this PR?

Can we close this one if you are going to do another PR for the same?

@scuxiayiqian
Copy link
Author

Yes. I made some mistakes while doing something push thing. Please close this one and I'll do another PR.

@senny
Copy link
Member

senny commented May 3, 2014

@scuxiayiqian please do not open a new PR, we only loose the discussion that's here already. You can clean up this PR without creating a new one. The only thing that can't be fixed, is changing the target branch. However that one looks good, so let's stick to this PR.

Simply arrange the commits locally as you want them to be in the PR. Then you need to force-push them to your fork like so:

git push -f origin local_branch_with_relevant_commits:master

Just replace local_branch_with_relevant_commits with whatever branch you are working locally.

@robin850
Copy link
Member

robin850 commented May 3, 2014

@scuxiayiqian : ATM, you just need to run git rebase -i HEAD~3 and replace the last two pick with squash and write a good commit message. Please ping us when it's done. Thanks! :-)

@scuxiayiqian
Copy link
Author

@robin850 @senny : I've already squashed all the commits together. Please check it. And please tell me if I need to make some revisions. Thanks!

@rafaelfranca
Copy link
Member

cc @senny @matthewd

@kamipo
Copy link
Member

kamipo commented Apr 30, 2017

This behavior is covered by the test #28295.

@kamipo kamipo closed this Apr 30, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants