Skip to content

doc: fix wrong image path and remove mention of the v2 branch #1454

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Sep 21, 2020
Merged

doc: fix wrong image path and remove mention of the v2 branch #1454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40390c7
doc: fix wrong image path
jeansebastienh Sep 21, 2020
ac173f0
doc: remove mention of the v2 branch
jeansebastienh Sep 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .github/CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

<p align="center"><img width="50%" src="docs/static_files/cli-artwork.png" /></p>
<p align="center"><img width="50%" src="../docs/static_files/cli-artwork.png" /></p>

## Topics

Expand Down Expand Up @@ -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.
Expand All @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!--- If your PR fully resolves and should automatically close the linked issue, use Closes. Otherwise, use Relates --->
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):
<!--
If the change is not user facing, just write "NONE" in the release-note block below.
-->
Expand Down