From de9a874401c2347b1617ca52ae42407969414c79 Mon Sep 17 00:00:00 2001 From: Yannik Fuhrmeister Date: Mon, 20 Jul 2020 14:40:05 +0200 Subject: [PATCH 01/16] Add first version of CONTRIBUTING.md --- CONTRIBUTING.md | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..3d144f7a --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,62 @@ +# Contributing + +There are multiple different workflows with different advantages and disadvantages. +The most common workflows are: + +- [GitFlow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) +- [GitHub Flow](https://githubflow.github.io/) +- [GitLab Flow](https://about.gitlab.com/blog/2014/09/29/gitlab-flow/) + +## GitHub Flow (How we want to work) + +GitHub Flow is very lightweight (especially compared to GitFlow). +This workflow uses only two kinds of branches: + +- Feature branch +- Main branch (previously called master) + +The `feature` branches are used to develop new features as well as fixes. +These branches are usually created out of main. + +Anything in the `main` branch is deployable. +The `main` branch is expected to be deployed regularly and is considered stable. + +### How to work with GitHub Flow + +For more Information see [GitHub Flow](https://githubflow.github.io/) + +TL;DR + +1. anything in the main branch is deployable +2. create descriptive branches off of main +3. push to named branches constantly +4. open a pull request at any time +5. merge only after pull request review +6. deploy immediately after review + +### Why not GitLab Flow or GitFlow + +Both `GitLab Flow` and `GitFlow` are to complex for our use case. + +## Working with The Community / Working with Forks + +Our current continuous integration workflow makes it very hard to work on own forks of the SecureCodeBox because CI tests cannot be executed outside of our repository. We are aware of that problem and are working on a solution. + +## Working with Issues + +`GitHub Flow` does not enforce you to use Issues but it is highly encouraged. +It is recommended to use an Issue for every Task taking longer than 1h (See [GitLab Flow](https://about.gitlab.com/blog/2014/09/29/gitlab-flow/)). + +## How to Write Commit Messages + +For more Information see [here](https://chris.beams.io/posts/git-commit/). + +TL;DR + +1. Separate subject from body with a blank line +2. Limit the subject line to 50 characters +3. Capitalize the subject line +4. Do not end the subject line with a period +5. Use the imperative mood in the subject line +6. Wrap the body at 72 characters +7. Use the body to explain what and why vs. how From b5d96574c83db0b7f2e91bc4c92fac26ce45d4aa Mon Sep 17 00:00:00 2001 From: Yannik Fuhrmeister Date: Wed, 22 Jul 2020 08:53:16 +0200 Subject: [PATCH 02/16] [WIP] Update CONTRIBUTING --- CONTRIBUTING.md | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3d144f7a..11a39d37 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,13 +1,8 @@ # Contributing -There are multiple different workflows with different advantages and disadvantages. -The most common workflows are: +## GitHub Flow -- [GitFlow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) -- [GitHub Flow](https://githubflow.github.io/) -- [GitLab Flow](https://about.gitlab.com/blog/2014/09/29/gitlab-flow/) - -## GitHub Flow (How we want to work) +For more information see [GitHub Flow](https://githubflow.github.io/) GitHub Flow is very lightweight (especially compared to GitFlow). This workflow uses only two kinds of branches: @@ -23,7 +18,7 @@ The `main` branch is expected to be deployed regularly and is considered stable. ### How to work with GitHub Flow -For more Information see [GitHub Flow](https://githubflow.github.io/) +For more information see [GitHub Flow](https://githubflow.github.io/) TL;DR @@ -34,22 +29,20 @@ TL;DR 5. merge only after pull request review 6. deploy immediately after review -### Why not GitLab Flow or GitFlow - -Both `GitLab Flow` and `GitFlow` are to complex for our use case. - -## Working with The Community / Working with Forks +## Working with Forks and Pull Requests Our current continuous integration workflow makes it very hard to work on own forks of the SecureCodeBox because CI tests cannot be executed outside of our repository. We are aware of that problem and are working on a solution. -## Working with Issues +Generally the SCB project follows the standard [GitHub Pull request process](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests). -`GitHub Flow` does not enforce you to use Issues but it is highly encouraged. -It is recommended to use an Issue for every Task taking longer than 1h (See [GitLab Flow](https://about.gitlab.com/blog/2014/09/29/gitlab-flow/)). +## Working with Issues / How to Contribute in Issues + +For every task taking more than 1h, opening an issue is required. +Before opening an Issue please verify there is no existing one covering your issue. ## How to Write Commit Messages -For more Information see [here](https://chris.beams.io/posts/git-commit/). +For more information see [here](https://chris.beams.io/posts/git-commit/). TL;DR @@ -60,3 +53,13 @@ TL;DR 5. Use the imperative mood in the subject line 6. Wrap the body at 72 characters 7. Use the body to explain what and why vs. how + +NOTE: Make sure you don't include `@mentions` or `fixes` keywords in your git commit messages. These should be included in the PR body instead. + +## Code Review + +## Code of Conduct + +## Code Style + + From c3ac26f67e41d13731e8ce2b4b39328af7e17ca9 Mon Sep 17 00:00:00 2001 From: Yannik Fuhrmeister Date: Wed, 22 Jul 2020 08:56:37 +0200 Subject: [PATCH 03/16] [WIP] Add Headline for CLA --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 11a39d37..3850d7aa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -62,4 +62,6 @@ NOTE: Make sure you don't include `@mentions` or `fixes` keywords in your git co ## Code Style +## Contributor License Agreement (CLA) + From ae5b3492ebe3901aa700a29156cbfe2f0dbe7573 Mon Sep 17 00:00:00 2001 From: Yannik Fuhrmeister Date: Wed, 22 Jul 2020 10:54:22 +0200 Subject: [PATCH 04/16] Adding init CODE_OF_CONDUCT --- CODE_OF_CONDUCT.md | 130 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 00000000..90272fed --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,130 @@ + +# Contributor Covenant Code of Conduct + +## Our Pledge + +We as members, contributors, and leaders pledge to make participation in our +community a harassment-free experience for everyone, regardless of age, body +size, visible or invisible disability, ethnicity, sex characteristics, gender +identity and expression, level of experience, education, socio-economic status, +nationality, personal appearance, race, religion, or sexual identity +and orientation. + +We pledge to act and interact in ways that contribute to an open, welcoming, +diverse, inclusive, and healthy community. + +## Our Standards + +Examples of behavior that contributes to a positive environment for our +community include: + +* Demonstrating empathy and kindness toward other people +* Being respectful of differing opinions, viewpoints, and experiences +* Giving and gracefully accepting constructive feedback +* Accepting responsibility and apologizing to those affected by our mistakes, + and learning from the experience +* Focusing on what is best not just for us as individuals, but for the + overall community + +Examples of unacceptable behavior include: + +* The use of sexualized language or imagery, and sexual attention or + advances of any kind +* Trolling, insulting or derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or email + address, without their explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Enforcement Responsibilities + +Community leaders are responsible for clarifying and enforcing our standards of +acceptable behavior and will take appropriate and fair corrective action in +response to any behavior that they deem inappropriate, threatening, offensive, +or harmful. + +Community leaders have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, and will communicate reasons for moderation +decisions when appropriate. + +## Scope + +This Code of Conduct applies within all community spaces, and also applies when +an individual is officially representing the community in public spaces. +Examples of representing our community include using an official e-mail address, +posting via an official social media account, or acting as an appointed +representative at an online or offline event. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported to the community leaders responsible for enforcement at +[INSERT CONTACT METHOD]. +All complaints will be reviewed and investigated promptly and fairly. + +All community leaders are obligated to respect the privacy and security of the +reporter of any incident. + +## Enforcement Guidelines + +Community leaders will follow these Community Impact Guidelines in determining +the consequences for any action they deem in violation of this Code of Conduct: + +### 1. Correction + +**Community Impact**: Use of inappropriate language or other behavior deemed +unprofessional or unwelcome in the community. + +**Consequence**: A private, written warning from community leaders, providing +clarity around the nature of the violation and an explanation of why the +behavior was inappropriate. A public apology may be requested. + +### 2. Warning + +**Community Impact**: A violation through a single incident or series +of actions. + +**Consequence**: A warning with consequences for continued behavior. No +interaction with the people involved, including unsolicited interaction with +those enforcing the Code of Conduct, for a specified period of time. This +includes avoiding interactions in community spaces as well as external channels +like social media. Violating these terms may lead to a temporary or +permanent ban. + +### 3. Temporary Ban + +**Community Impact**: A serious violation of community standards, including +sustained inappropriate behavior. + +**Consequence**: A temporary ban from any sort of interaction or public +communication with the community for a specified period of time. No public or +private interaction with the people involved, including unsolicited interaction +with those enforcing the Code of Conduct, is allowed during this period. +Violating these terms may lead to a permanent ban. + +### 4. Permanent Ban + +**Community Impact**: Demonstrating a pattern of violation of community +standards, including sustained inappropriate behavior, harassment of an +individual, or aggression toward or disparagement of classes of individuals. + +**Consequence**: A permanent ban from any sort of public interaction within +the community. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], +version 2.0, available at +https://www.contributor-covenant.org/version/2/0/code_of_conduct.html. + +Community Impact Guidelines were inspired by [Mozilla's code of conduct +enforcement ladder](https://github.com/mozilla/diversity). + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see the FAQ at +https://www.contributor-covenant.org/faq. Translations are available at +https://www.contributor-covenant.org/translations. + From f170d8e9b25172468607604bbe37524dd6af23f1 Mon Sep 17 00:00:00 2001 From: Yannik Fuhrmeister Date: Wed, 22 Jul 2020 11:05:16 +0200 Subject: [PATCH 05/16] Add reference to CODE_OF_CONDUCT --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3850d7aa..d1d83459 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -60,6 +60,8 @@ NOTE: Make sure you don't include `@mentions` or `fixes` keywords in your git co ## Code of Conduct +Please have a look at our [Code of Conduct](./CODE_OF_CONDUCT.md) before you write an Issue or make a PR. + ## Code Style ## Contributor License Agreement (CLA) From 0c752955e05d6614bc3d96c6a2a6ea71ec2633f5 Mon Sep 17 00:00:00 2001 From: Yannik Fuhrmeister Date: Wed, 22 Jul 2020 11:34:41 +0200 Subject: [PATCH 06/16] Adding Table of Contents --- CONTRIBUTING.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d1d83459..1e1a8155 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,5 +1,13 @@ # Contributing +. [GitHub Flow](#GitHub Flow) +. [Working with Forks and Pull Requests](#Working with Forks and Pull Requests) +. [Working with Issues / How to Contribute in Issues](#Working with Issues / How to Contribute in Issues) +. [How to Write Commit Messages](#How to Write Commit Messages) +. [Code Review](#Code Review) +. [Code of Conduct](#Code of Conduct) +. [Contributor License Agreement (CLA](#Contributor License Agreement (CLA) + ## GitHub Flow For more information see [GitHub Flow](https://githubflow.github.io/) From 6bba97998285e2235fb3513ca9fa16ff5a4b6eaa Mon Sep 17 00:00:00 2001 From: Yannik Fuhrmeister Date: Wed, 22 Jul 2020 11:35:50 +0200 Subject: [PATCH 07/16] Fix Syntax for Table of Contents --- CONTRIBUTING.md | 17 ++++++++++------- ressources.md | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 ressources.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1e1a8155..522f95e8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,12 +1,15 @@ # Contributing -. [GitHub Flow](#GitHub Flow) -. [Working with Forks and Pull Requests](#Working with Forks and Pull Requests) -. [Working with Issues / How to Contribute in Issues](#Working with Issues / How to Contribute in Issues) -. [How to Write Commit Messages](#How to Write Commit Messages) -. [Code Review](#Code Review) -. [Code of Conduct](#Code of Conduct) -. [Contributor License Agreement (CLA](#Contributor License Agreement (CLA) +- [Contributing](#contributing) + - [GitHub Flow](#github-flow) + - [How to work with GitHub Flow](#how-to-work-with-github-flow) + - [Working with Forks and Pull Requests](#working-with-forks-and-pull-requests) + - [Working with Issues / How to Contribute in Issues](#working-with-issues--how-to-contribute-in-issues) + - [How to Write Commit Messages](#how-to-write-commit-messages) + - [Code Review](#code-review) + - [Code of Conduct](#code-of-conduct) + - [Code Style](#code-style) + - [Contributor License Agreement (CLA)](#contributor-license-agreement-cla) ## GitHub Flow diff --git a/ressources.md b/ressources.md new file mode 100644 index 00000000..b8f08a2f --- /dev/null +++ b/ressources.md @@ -0,0 +1,15 @@ +# Ressources for Contributing + +## Contributing + +- [Kubernetes Contributing](https://github.com/kubernetes/community/blob/master/contributors/guide/contributing.md#learn-about-sigs) +- [Kubernetes Pull-requests](https://github.com/kubernetes/community/blob/master/contributors/guide/pull-requests.md) +- [Nodejs Contributing](https://github.com/nodejs/node/blob/master/CONTRIBUTING.md) + +## Code of Conduct + +- [Kubernetes Code of Conduct](https://github.com/kubernetes/community/blob/master/governance.md#code-of-conduct) + +## Developer's Certificate of Origin? (Nodejs) + +## Rebase over Merge? (Nodejs) From 00f2237f56467a5fa2cc8bcbb3055ed84e9f6b15 Mon Sep 17 00:00:00 2001 From: Yannik Fuhrmeister Date: Mon, 27 Jul 2020 08:04:44 +0200 Subject: [PATCH 08/16] Remove CLA section We are not sure if we need an agreement like this Until then we will remove this section --- CONTRIBUTING.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 522f95e8..496485d1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -75,6 +75,4 @@ Please have a look at our [Code of Conduct](./CODE_OF_CONDUCT.md) before you wri ## Code Style -## Contributor License Agreement (CLA) - From 720c3c70df77dc4117bce201fb46fe4951fc4496 Mon Sep 17 00:00:00 2001 From: Yannik Fuhrmeister Date: Mon, 27 Jul 2020 08:08:03 +0200 Subject: [PATCH 09/16] Enclose plain links in angle brackets --- CODE_OF_CONDUCT.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 90272fed..f5ca2738 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -117,14 +117,14 @@ the community. This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0, available at -https://www.contributor-covenant.org/version/2/0/code_of_conduct.html. +. Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity). -[homepage]: https://www.contributor-covenant.org +[homepage]: For answers to common questions about this code of conduct, see the FAQ at -https://www.contributor-covenant.org/faq. Translations are available at -https://www.contributor-covenant.org/translations. +. Translations are available at +. From 9b226eb450861f883517ccecc31e414a1418045e Mon Sep 17 00:00:00 2001 From: Yannik Fuhrmeister Date: Mon, 27 Jul 2020 08:16:34 +0200 Subject: [PATCH 10/16] Escape special char in headings --- CODE_OF_CONDUCT.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index f5ca2738..ca21bb21 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -72,7 +72,7 @@ reporter of any incident. Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct: -### 1. Correction +### 1\. Correction **Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community. @@ -81,7 +81,7 @@ unprofessional or unwelcome in the community. clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested. -### 2. Warning +### 2\. Warning **Community Impact**: A violation through a single incident or series of actions. @@ -93,7 +93,7 @@ includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban. -### 3. Temporary Ban +### 3\. Temporary Ban **Community Impact**: A serious violation of community standards, including sustained inappropriate behavior. @@ -104,7 +104,7 @@ private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban. -### 4. Permanent Ban +### 4\. Permanent Ban **Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an From 526e93adf570b8273ac94dec1fbeab7465ce89ec Mon Sep 17 00:00:00 2001 From: Yannik Fuhrmeister Date: Mon, 27 Jul 2020 08:26:07 +0200 Subject: [PATCH 11/16] Fix markdown syntax --- CONTRIBUTING.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 496485d1..c06986c2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,11 +21,11 @@ This workflow uses only two kinds of branches: - Feature branch - Main branch (previously called master) -The `feature` branches are used to develop new features as well as fixes. +The _feature_ branches are used to develop new features as well as fixes. These branches are usually created out of main. -Anything in the `main` branch is deployable. -The `main` branch is expected to be deployed regularly and is considered stable. +Anything in the _main_ branch is deployable. +The _main_ branch is expected to be deployed regularly and is considered stable. ### How to work with GitHub Flow @@ -33,7 +33,7 @@ For more information see [GitHub Flow](https://githubflow.github.io/) TL;DR -1. anything in the main branch is deployable +1. anything in the _main_ branch is deployable 2. create descriptive branches off of main 3. push to named branches constantly 4. open a pull request at any time @@ -42,11 +42,11 @@ TL;DR ## Working with Forks and Pull Requests -Our current continuous integration workflow makes it very hard to work on own forks of the SecureCodeBox because CI tests cannot be executed outside of our repository. We are aware of that problem and are working on a solution. +Our current continuous integration workflow makes it very hard to work on own forks of the _secureCodeBox_ because CI tests cannot be executed outside of our repository. We are aware of that problem and are working on a solution. -Generally the SCB project follows the standard [GitHub Pull request process](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests). +Generally the _secureCodeBox_ project follows the standard [GitHub Pull request process](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests). -## Working with Issues / How to Contribute in Issues +## Working with Issues/How to Contribute in Issues For every task taking more than 1h, opening an issue is required. Before opening an Issue please verify there is no existing one covering your issue. From 5cab1eba4f1798e5905ea462c9edf03774e32e5b Mon Sep 17 00:00:00 2001 From: Yannik Fuhrmeister Date: Mon, 27 Jul 2020 08:28:49 +0200 Subject: [PATCH 12/16] Change wording --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c06986c2..4ac8dd84 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -48,8 +48,8 @@ Generally the _secureCodeBox_ project follows the standard [GitHub Pull request ## Working with Issues/How to Contribute in Issues -For every task taking more than 1h, opening an issue is required. -Before opening an Issue please verify there is no existing one covering your issue. +It is mandatory to open an issue, if the task takes longer than one hour. +Before you open an issue please verify there is no existing one covering your issue. ## How to Write Commit Messages From 196b4da07b2487939d9ca815020a22dd38183628 Mon Sep 17 00:00:00 2001 From: Yannik Fuhrmeister Date: Wed, 29 Jul 2020 13:10:29 +0200 Subject: [PATCH 13/16] Remove dead link --- CONTRIBUTING.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4ac8dd84..6c7fa69d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,7 +9,6 @@ - [Code Review](#code-review) - [Code of Conduct](#code-of-conduct) - [Code Style](#code-style) - - [Contributor License Agreement (CLA)](#contributor-license-agreement-cla) ## GitHub Flow From 0eb35ca9843f3e701f8ca7faa9bbcbdf5e4ccfd7 Mon Sep 17 00:00:00 2001 From: Yannik Fuhrmeister Date: Mon, 28 Sep 2020 08:34:15 +0200 Subject: [PATCH 14/16] Remove Heading --- CONTRIBUTING.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6c7fa69d..351d9a30 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,7 +8,6 @@ - [How to Write Commit Messages](#how-to-write-commit-messages) - [Code Review](#code-review) - [Code of Conduct](#code-of-conduct) - - [Code Style](#code-style) ## GitHub Flow @@ -72,6 +71,3 @@ NOTE: Make sure you don't include `@mentions` or `fixes` keywords in your git co Please have a look at our [Code of Conduct](./CODE_OF_CONDUCT.md) before you write an Issue or make a PR. -## Code Style - - From 1c602d03ea307fb90d598057210545bced277358 Mon Sep 17 00:00:00 2001 From: Yannik Fuhrmeister Date: Mon, 28 Sep 2020 13:02:34 +0200 Subject: [PATCH 15/16] Add Email Address for CoC Complaints --- CODE_OF_CONDUCT.md | 2 +- CONTRIBUTING.md | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index ca21bb21..b2903cf6 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -61,7 +61,7 @@ representative at an online or offline event. Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at -[INSERT CONTACT METHOD]. + All complaints will be reviewed and investigated promptly and fairly. All community leaders are obligated to respect the privacy and security of the diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 351d9a30..3d9ebb73 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,7 +6,6 @@ - [Working with Forks and Pull Requests](#working-with-forks-and-pull-requests) - [Working with Issues / How to Contribute in Issues](#working-with-issues--how-to-contribute-in-issues) - [How to Write Commit Messages](#how-to-write-commit-messages) - - [Code Review](#code-review) - [Code of Conduct](#code-of-conduct) ## GitHub Flow @@ -65,8 +64,6 @@ TL;DR NOTE: Make sure you don't include `@mentions` or `fixes` keywords in your git commit messages. These should be included in the PR body instead. -## Code Review - ## Code of Conduct Please have a look at our [Code of Conduct](./CODE_OF_CONDUCT.md) before you write an Issue or make a PR. From 92862f6cf974c0b55db75eb7111cd9fe3b3012a3 Mon Sep 17 00:00:00 2001 From: Yannik Fuhrmeister Date: Mon, 28 Sep 2020 15:25:57 +0200 Subject: [PATCH 16/16] Remove unused file from Repo --- ressources.md | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 ressources.md diff --git a/ressources.md b/ressources.md deleted file mode 100644 index b8f08a2f..00000000 --- a/ressources.md +++ /dev/null @@ -1,15 +0,0 @@ -# Ressources for Contributing - -## Contributing - -- [Kubernetes Contributing](https://github.com/kubernetes/community/blob/master/contributors/guide/contributing.md#learn-about-sigs) -- [Kubernetes Pull-requests](https://github.com/kubernetes/community/blob/master/contributors/guide/pull-requests.md) -- [Nodejs Contributing](https://github.com/nodejs/node/blob/master/CONTRIBUTING.md) - -## Code of Conduct - -- [Kubernetes Code of Conduct](https://github.com/kubernetes/community/blob/master/governance.md#code-of-conduct) - -## Developer's Certificate of Origin? (Nodejs) - -## Rebase over Merge? (Nodejs)