Skip to content

Added support for the 'low', 'high', and 'optimum' attributes that are missing from the <meter> tag. #3513

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

Merged
merged 1 commit into from
Mar 25, 2015

Conversation

agelter
Copy link

@agelter agelter commented Mar 25, 2015

No description provided.

@facebook-github-bot
Copy link

Thank you for your pull request and welcome to our community. We require contributors to sign our Contributor License Agreement, and we don't seem to have you on file. In order for us to review and merge your code, please sign up at https://code.facebook.com/cla - and if you have received this in error or have any questions, please drop us a line at cla@fb.com. Thanks!

@zpao
Copy link
Member

zpao commented Mar 25, 2015

Yea, this seems fine. Can you actually remove the last 2 commits? We'll update docs manually with other attributes and the merge is extraneous since we'll just merge this back.

@agelter
Copy link
Author

agelter commented Mar 25, 2015

CLA signed.
Sorry about my ignorance, but I can't seem to figure out how to remove the last two commits. Is there an easy way to do this or do I need to create a new branch and apply just the changes from the first commit?

@facebook-github-bot
Copy link

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Facebook open source project. Thanks!

@zpao
Copy link
Member

zpao commented Mar 25, 2015

# move back 2 commits
git reset --hard HEAD~2
# force push since you're changing history in the remote
git push -f

I won't lie and say those aren't risky operations, especially with a merge in ther :) There's a chance you'll screw it all up (I certainly have). Luckily it's a smaller change so easily reproducible. In the future you'll probably want to do PRs in a branch anyway (and not on master).

If you don't feel comfortable, then no worries at all. I can grab the code commit and push that with you as the author.

@agelter
Copy link
Author

agelter commented Mar 25, 2015

Thanks! I think it updated properly? Let me know if there are still issues.

@zpao
Copy link
Member

zpao commented Mar 25, 2015

Awesome, thanks!. Don't worry about the failing test, that's not you.

zpao added a commit that referenced this pull request Mar 25, 2015
Added support for the 'low', 'high', and 'optimum' attributes that are missing from the <meter> tag.
@zpao zpao merged commit 27a191e into facebook:master Mar 25, 2015
@zpao zpao added this to the 0.13.2 milestone Mar 25, 2015
zpao added a commit to zpao/react that referenced this pull request Apr 13, 2015
Added support for the 'low', 'high', and 'optimum' attributes that are missing from the <meter> tag.
zpao added a commit to zpao/react that referenced this pull request Apr 17, 2015
Added support for the 'low', 'high', and 'optimum' attributes that are missing from the <meter> tag.
zpao added a commit to zpao/react that referenced this pull request Apr 18, 2015
Added support for the 'low', 'high', and 'optimum' attributes that are missing from the <meter> tag.
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.

3 participants