From 1f93fcf67d98d001de5bbecad3dc8dff7acf0a4b Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Mon, 23 Nov 2020 10:41:24 +0200 Subject: [PATCH] fixes Signed-off-by: Jari Kolehmainen --- CODE_OF_CONDUCT.md | 2 +- docs/contributing/github_workflow.md | 4 ++-- docs/contributing/testing.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 1b9bfcdcfd..6eaa07c2fd 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -60,7 +60,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]. +info@k8slens.dev. 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/docs/contributing/github_workflow.md b/docs/contributing/github_workflow.md index 5e75a65ad2..3509645b47 100644 --- a/docs/contributing/github_workflow.md +++ b/docs/contributing/github_workflow.md @@ -30,7 +30,7 @@ git remote add $GITHUB_USER git@github.com:${GITHUB_USER}/lens.git git remote set-url --push origin no_push # Set your fork remote as a default push target -git push --set-upstream $GITHUB_USER main +git push --set-upstream $GITHUB_USER master ``` Your remotes should look something like this: @@ -56,7 +56,7 @@ Rebase your branch: ``` git fetch origin -git rebase origin/main +git rebase origin/master Current branch my_feature_branch is up to date. ``` diff --git a/docs/contributing/testing.md b/docs/contributing/testing.md index d85ccf1f28..fa5e495797 100644 --- a/docs/contributing/testing.md +++ b/docs/contributing/testing.md @@ -42,4 +42,4 @@ In order for a PR to be merged, the following conditions should exist: 1. The PR has passed all the automated tests (style, build & conformance tests). 2. PR commits have been signed with the `--signoff` option. 3. PR was reviewed and approved by a code owner. -4. PR is rebased against upstream's main branch. +4. PR is rebased against upstream's master branch.