Skip to content

Commit

Permalink
fix linting errors (#26)
Browse files Browse the repository at this point in the history
  • Loading branch information
s-laugh authored Sep 20, 2019
1 parent 351ed9d commit a5d9e5d
Show file tree
Hide file tree
Showing 6 changed files with 192 additions and 190 deletions.
3 changes: 1 addition & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ If this is your first time contributing on GitHub, don't worry! Let us know if y

The “Welcome” project in ESDC org (master branch) used to publish recommendations and guides (how to).
Draft documents can be created either in a branch in ESDC or a branch in the Fork on DevCoP (prefix with `draft-`).
Initial draft doesn’t require review, but any changes to the draft require review via a PR.
Initial draft doesn’t require review, but any changes to the draft require review via a PR.
The publish of the doc will also have a final review via a PR.

### Security

**Do not post any security issues on the public repository!** See [SECURITY.md](SECURITY.md)

12 changes: 6 additions & 6 deletions Guides/Security.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ If you are working on a project in this space you must be following the requirem

## Two Factor Authentication (2FA)

For all accounts that are given access to code hosted publicly, their account **must** be enabled with 2FA.
For all accounts that are given access to code hosted publicly, their account **must** be enabled with 2FA.
This requires a project to be hosted under a group, where the group can have this setting enforced.
Users with 2FA enabled will require an access token to authenticate from git.
https://help.github.com/en/articles/securing-your-account-with-two-factor-authentication-2fa
[https://help.github.com/en/articles/securing-your-account-with-two-factor-authentication-2fa](https://help.github.com/en/articles/securing-your-account-with-two-factor-authentication-2fa)

## Gated Approvals

Merge request or pull request approvals are **required** when modifying code.
Merge request or pull request approvals are **required** when modifying code.
When changing the "source of truth" aka *master* branch, there must be some kind of approval by someone who did not change the code.
This is is also just good practice and should be done even inside the network.
https://help.github.com/en/articles/enabling-required-status-checks
[https://help.github.com/en/articles/enabling-required-status-checks](https://help.github.com/en/articles/enabling-required-status-checks)

**Note:** Under the open GoC license or Crown Copyright you can not accept pull requests from citizens. You can only accept pull requests from GoC employees (from any department).

## Verified Commits

When pushing code to public git repositories, the commit **must** be signed by a GPG key created on the computer you are committing code from and registered with against your user.
https://help.github.com/en/articles/managing-commit-signature-verification
When pushing code to public git repositories, the commit **must** be signed by a GPG key created on the computer you are committing code from and registered with against your user.
[https://help.github.com/en/articles/managing-commit-signature-verification](https://help.github.com/en/articles/managing-commit-signature-verification)
20 changes: 2 additions & 18 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,21 +1,5 @@
MIT License
Open Government Licence - Canada

Copyright (c) Her Majesty the Queen in Right of Canada, as represented by the Employment and Social Development Canada, 2019

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
[http://open.canada.ca/en/open-government-licence-canada](http://open.canada.ca/en/open-government-licence-canada)
13 changes: 0 additions & 13 deletions LICENSE.md

This file was deleted.

Loading

0 comments on commit a5d9e5d

Please sign in to comment.