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

Add admonition type to shortcode #9482

Merged
merged 8 commits into from
Nov 6, 2018
Merged

Add admonition type to shortcode #9482

merged 8 commits into from
Nov 6, 2018

Conversation

lucperkins
Copy link
Contributor

In response to issue #9397.

This is mostly done but I'll need to wait on the current multilingual work (so that we can rely on language-specific terms for "note," "caution", etc.).

@lucperkins
Copy link
Contributor Author

/hold

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jul 12, 2018
@k8sio-netlify-preview-bot
Copy link
Collaborator

k8sio-netlify-preview-bot commented Jul 12, 2018

Deploy preview for kubernetes-io-master-staging ready!

Built with commit eea16e6

https://deploy-preview-9482--kubernetes-io-master-staging.netlify.com

@zacharysarah
Copy link
Contributor

@lucperkins Thanks for this, it's a nice quality of life improvement. I'm happy to approve it when you're ready. 👍

@zacharysarah
Copy link
Contributor

/assign

@zacharysarah
Copy link
Contributor

@lucperkins Ping--looks like #10355 (and any dependent PRs it spawns) is the last of the language-related PRs. Pending merge conflict resolution, is this PR still good to go?

@lucperkins
Copy link
Contributor Author

@zacharysarah This is good to go. In the future I'd like to use localized terms for "note," "caution," etc. but I think we can punt on that, as the Chinese repo, for one, was already using the English terms and the others may be as well.

@zparnold
Copy link
Member

zparnold commented Oct 3, 2018

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 3, 2018
@zparnold
Copy link
Member

zparnold commented Oct 3, 2018

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 3, 2018
@zparnold
Copy link
Member

zparnold commented Oct 3, 2018

/assign @kbarnard10

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 4, 2018
@kubernetes-docs-i18n-bot kubernetes-docs-i18n-bot added the language/en Issues or PRs related to English language label Oct 4, 2018
@lucperkins
Copy link
Contributor Author

@zparnold Okay, this is once again ready to go.

@zparnold
Copy link
Member

zparnold commented Oct 4, 2018

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 4, 2018
@zacharysarah
Copy link
Contributor

@lucperkins 👋 Good grief, looks like previous /approve comments didn't take. If you resolve the merge conflicts again, I'll make it so that this PR can merge with a simple /lgtm and /hold cancel.

/approve
/hold

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Oct 30, 2018
@zacharysarah
Copy link
Contributor

@lucperkins 👋 Ping

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 6, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: zacharysarah, zparnold

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [zacharysarah,zparnold]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@lucperkins
Copy link
Contributor Author

@zacharysarah Done!

@zacharysarah
Copy link
Contributor

/lgtm
/hold cancel

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Nov 6, 2018
@k8s-ci-robot k8s-ci-robot merged commit d65e179 into kubernetes:master Nov 6, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/en Issues or PRs related to English language lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants