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

updating CoC link and security link #42

Merged
merged 1 commit into from
Feb 28, 2019
Merged

updating CoC link and security link #42

merged 1 commit into from
Feb 28, 2019

Conversation

vsoch
Copy link
Contributor

@vsoch vsoch commented Feb 26, 2019

Signed-off-by: Vanessa Sochat vsochat@stanford.edu

opencontainers/.github#3

@vbatts
Copy link
Member

vbatts commented Feb 26, 2019

LGTM

Approved with PullApprove

Copy link
Member

@dmcgowan dmcgowan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Links need to be updated


# Copyright and license

Copyright © 2016 Docker, Inc. All rights reserved, except as follows. Code is released under the [Apache 2.0 license](LICENSE). This `README.md` file and the [`CONTRIBUTING.md`](CONTRIBUTING.md) file are licensed under the Creative Commons Attribution 4.0 International License under the terms and conditions set forth in the file [`LICENSE.docs`](LICENSE.docs). You may obtain a duplicate copy of the same license, titled CC BY-SA 4.0, at http://creativecommons.org/licenses/by-sa/4.0/.

[security]: https://github.com/opencontainers/org/blob/master/security
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like it needs a .md, the link 404s for me

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that change is in-flight

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The security link above will be to a folder, so it should work without the .md.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a PR somewhere to drop the .md from the file?

README.md Outdated

# Copyright and license

Copyright © 2016 Docker, Inc. All rights reserved, except as follows. Code is released under the [Apache 2.0 license](LICENSE). This `README.md` file and the [`CONTRIBUTING.md`](CONTRIBUTING.md) file are licensed under the Creative Commons Attribution 4.0 International License under the terms and conditions set forth in the file [`LICENSE.docs`](LICENSE.docs). You may obtain a duplicate copy of the same license, titled CC BY-SA 4.0, at http://creativecommons.org/licenses/by-sa/4.0/.

[security]: https://github.com/opencontainers/org/blob/master/security
[code-of-conduct]: https://github.com/opencontainers/org/blob/master/.github/CODE_OF_CONDUCT.md
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also 404s, maybe https://github.com/opencontainers/org/blob/master/code-of-conduct.md?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

she has a PR up for this

@vbatts
Copy link
Member

vbatts commented Feb 26, 2019 via email

@dmcgowan
Copy link
Member

Sounds good, once that PR is open and matches then looks good here. We should probably merge this at the same time as that PR.

@vsoch
Copy link
Contributor Author

vsoch commented Feb 26, 2019

here you go @dmcgowan opencontainers/.github#6
Agreed! If we click fast enough, maybe we won't be in the catch-22 :)
When the PR in the org repo is good we should merge that first, and then double check the links here just in case there is an issue.

@vbatts
Copy link
Member

vbatts commented Feb 26, 2019

LGTM

Approved with PullApprove

@vsoch
Copy link
Contributor Author

vsoch commented Feb 27, 2019

The commits have been squashed!

Signed-off-by: Vanessa Sochat <vsochat@stanford.edu>
@vsoch
Copy link
Contributor Author

vsoch commented Feb 28, 2019

Code of conduct link is updated to be outside of .github (and in all caps) to reflect discussion in OCI call.

@dmcgowan
Copy link
Member

dmcgowan commented Feb 28, 2019

LGTM

Approved with PullApprove

1 similar comment
@vbatts
Copy link
Member

vbatts commented Feb 28, 2019

LGTM

Approved with PullApprove

@dmcgowan dmcgowan merged commit ac19fd6 into opencontainers:master Feb 28, 2019
@vsoch
Copy link
Contributor Author

vsoch commented Feb 28, 2019

https://media3.giphy.com/media/1BfREvzGRnZQWk3WJ7/source.gif

@vsoch vsoch deleted the fix/CoC-link branch February 28, 2019 22:17
@vbatts
Copy link
Member

vbatts commented Feb 28, 2019

lol

@vsoch
Copy link
Contributor Author

vsoch commented Feb 28, 2019

I know, he's huge and terrifying. I think that makes it better?

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

3 participants