Skip to content

Commit 68e0734

Browse files
authored
Merge branch 'master' into feat/merge-js-guidelines
2 parents 11b6aae + 0c91e7c commit 68e0734

9 files changed

+310
-1
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,4 @@ This repository falls under the IPFS [Code of Conduct](https://github.com/ipfs/c
137137

138138
## License
139139

140-
MIT © Protocol Labs, Inc.
140+
This repository is mainly for documents. All of these are licensed under the [CC-BY-SA 3.0](https://ipfs.io/ipfs/QmVreNvKsQmQZ83T86cWSjPu2vR3yZHGPm5jnxFuunEB9u) license © 2016 Protocol Labs Inc. Any code is under an [MIT license](LICENSE) © 2016 Protocol Labs Inc.

assets/ethipfs/eth<3ipfs.png

48.4 KB
Loading

assets/ethipfs/ipfs-eth-grey.svg

+119
Loading

assets/ethipfs/ipfs-eth-somecolor.svg

+117
Loading
+42
Loading
Loading
File renamed without changes.

js-project-guidelines.md

+11
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Also, remember:
2020

2121
- [Goals](#goals)
2222
- [Contributing](#contributing)
23+
- [Captains and Maintainers](#captains-and-maintainers)
2324
- [Guidelines](#guidelines)
2425
- [Linting & Code Style](#linting--code-style)
2526
- [Testing](#testing)
@@ -78,6 +79,16 @@ When reporting a bug, if possible, provide a way for us to reproduce it (or even
7879

7980
Always run tests before pushing and PR'ing your code.
8081

82+
### Captains and Maintainers
83+
84+
For each JavaScript repository in the IPFS, libp2p, IPLD, or related GitHub orgs, there should be a single Captain specified in the Maintainers section of the README for that repository. The Captain is in charge of merging PRs, keeping issues up to date, and overall quality of a repository.
85+
86+
Sometimes, a Captain may elect to have other maintainers that also have merge ability and commit access to the main repo. These maintainers can help out, but defer to the Captain as the person in charge of maintaining quality across the repo. It is important that this distinction is explicit; if there are long-standing PRs or issues, it is ultimately up to the Captain to gather information about the issue or PR. A Captain only makes a decision if he _needs_ to and _all_ methods of discussion are exhausted. Our community strives to trust the Captain as someone who ultimately has the most knowledge of a repo (even if they are also opinionated, and even if they have to spend effort to source that knowledge). This may change in the future, if we go with more non-hierarchical model.
87+
88+
Repositories which do not have Captains will show up in red on [Project Repos](https://project-repos.ipfs.io). Please open an issue in the repository asking for a captain to be nominated if none is provided.
89+
90+
If you would like to become a maintainer (or lieutenant, or first mate, or whatever nautical metaphor you prefer), please open an issue about it! Chances are that we would love to have more help.
91+
8192
## Guidelines
8293

8394
### Linting & Code Style
File renamed without changes.

0 commit comments

Comments
 (0)