From 40390c7591c07aa5062eb7bd769ea9eeb825969a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20Hedde?= Date: Mon, 21 Sep 2020 13:24:16 +0200 Subject: [PATCH 1/2] doc: fix wrong image path --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 2b1bfb72ca..f0941f0688 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -3,7 +3,7 @@ `scaleway-cli` is Apache 2.0 licensed and accepts contributions via GitHub. This document will cover how to contribute to the project and report issues. -

+

## Topics From ac173f0f224e3ebecb85ff199d3519cc96c76aed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20Hedde?= Date: Mon, 21 Sep 2020 13:25:11 +0200 Subject: [PATCH 2/2] doc: remove mention of the v2 branch --- .github/CONTRIBUTING.md | 6 ++---- .github/pull_request_template.md | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index f0941f0688..ea336c329c 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -52,7 +52,7 @@ To submit code: - Create a topic branch from where you want to base your work (usually master) - Add tests to cover contributed code - Push your commit(s) to your topic branch on your fork -- Open a pull request against `scaleway-cli` `v2` branch that follows [PR guidelines](#pull-request-guidelines) +- Open a pull request against `scaleway-cli` `master` branch that follows [PR guidelines](#pull-request-guidelines) The [maintainers](MAINTAINERS.md) of `scaleway-cli` use a "Let's Get This Merged" (LGTM) message in the pull request to note that the commits are ready to merge. After one or more maintainer states LGTM, we will merge. @@ -73,9 +73,7 @@ The goal of the following guidelines is to have Pull Requests (PRs) that are fai - **Please, keep us updated.** We will try our best to merge your PR, but please notice that PRs may be closed after 30 days of inactivity. -Your pull request should be rebased against the current `v2` branch. Please do not merge -the current `v2` branch in with your topic branch, nor use the Update Branch button provided -by GitHub on the pull request page. +Your pull request should be rebased against the `master` branch. Keep in mind only the **pull request title** will be used as commit message as we stash all commits on merge. diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index b54a4ad0d8..93a0b57a52 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -8,7 +8,7 @@ Relates OR Closes #0000 -Release note for [CHANGELOG](https://github.com/scaleway/scaleway-cli/blob/v2/CHANGELOG.md): +Release note for [CHANGELOG](https://github.com/scaleway/scaleway-cli/blob/master/CHANGELOG.md):