Skip to content

Commit 79f7839

Browse files
strklafriks
authored andcommitted
Wrap most text to 80 columns (#2452)
1 parent 04ec795 commit 79f7839

File tree

1 file changed

+136
-31
lines changed

1 file changed

+136
-31
lines changed

CONTRIBUTING.md

Lines changed: 136 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -20,51 +20,100 @@
2020

2121
## Introduction
2222

23-
This document explains how to contribute changes to the Gitea project. It assumes you have followed the [installation instructions](https://docs.gitea.io/en-us/). Sensitive security-related issues should be reported to [[email protected]](mailto:[email protected]).
23+
This document explains how to contribute changes to the Gitea project.
24+
It assumes you have followed the
25+
[installation instructions](https://docs.gitea.io/en-us/).
26+
Sensitive security-related issues should be reported to
27+
2428

2529
## Bug reports
2630

27-
Please search the issues on the issue tracker with a variety of keywords to ensure your bug is not already reported.
31+
Please search the issues on the issue tracker with a variety of keywords
32+
to ensure your bug is not already reported.
2833

29-
If unique, [open an issue](https://github.com/go-gitea/gitea/issues/new) and answer the questions so we can understand and reproduce the problematic behavior.
34+
If unique, [open an issue](https://github.com/go-gitea/gitea/issues/new)
35+
and answer the questions so we can understand and reproduce the
36+
problematic behavior.
3037

31-
To show us that the issue you are having is in Gitea itself, please write clear, concise instructions so we can reproduce the behavior (even if it seems obvious). The more detailed and specific you are, the faster we can fix the issue. Check out [How to Report Bugs Effectively](http://www.chiark.greenend.org.uk/~sgtatham/bugs.html).
38+
To show us that the issue you are having is in Gitea itself, please
39+
write clear, concise instructions so we can reproduce the behavior
40+
(even if it seems obvious). The more detailed and specific you are,
41+
the faster we can fix the issue. Check out [How to Report Bugs
42+
Effectively](http://www.chiark.greenend.org.uk/~sgtatham/bugs.html).
3243

33-
Please be kind, remember that Gitea comes at no cost to you, and you're getting free help.
44+
Please be kind, remember that Gitea comes at no cost to you, and you're
45+
getting free help.
3446

3547
## Discuss your design
3648

37-
The project welcomes submissions but please let everyone know what you're working on if you want to change or add something to the Gitea repositories.
49+
The project welcomes submissions but please let everyone know what
50+
you're working on if you want to change or add something to the Gitea
51+
repositories.
3852

39-
Before starting to write something new for the Gitea project, please [file an issue](https://github.com/go-gitea/gitea/issues/new). Significant changes must go through the [change proposal process](https://github.com/go-gitea/proposals) before they can be accepted.
53+
Before starting to write something new for the Gitea project, please [file
54+
an issue](https://github.com/go-gitea/gitea/issues/new). Significant
55+
changes must go through the [change proposal
56+
process](https://github.com/go-gitea/proposals) before they can be
57+
accepted.
4058

41-
This process gives everyone a chance to validate the design, helps prevent duplication of effort, and ensures that the idea fits inside the goals for the project and tools. It also checks that the design is sound before code is written; the code review tool is not the place for high-level discussions.
59+
This process gives everyone a chance to validate the design, helps
60+
prevent duplication of effort, and ensures that the idea fits inside
61+
the goals for the project and tools. It also checks that the design is
62+
sound before code is written; the code review tool is not the place for
63+
high-level discussions.
4264

4365
## Testing redux
4466

45-
Before sending code out for review, run all the tests for the whole tree to make sure the changes don't break other usage and keep the compatibility on upgrade. To make sure you are running the test suite exactly like we do, you should install the CLI for [Drone CI](https://github.com/drone/drone), as we are using the server for continous testing, following [these instructions](http://readme.drone.io/usage/getting-started-cli). After that you can simply call `drone exec` within your working directory and it will try to run the test suite locally.
67+
Before sending code out for review, run all the tests for the
68+
whole tree to make sure the changes don't break other usage
69+
and keep the compatibility on upgrade. To make sure you are
70+
running the test suite exactly like we do, you should install
71+
the CLI for [Drone CI](https://github.com/drone/drone), as
72+
we are using the server for continous testing, following [these
73+
instructions](http://readme.drone.io/usage/getting-started-cli). After
74+
that you can simply call `drone exec` within your working directory and
75+
it will try to run the test suite locally.
4676

4777
## Vendoring
4878

49-
We keep a cached copy of dependencies within the `vendor/` directory, managing updates via [govendor](http://github.com/kardianos/govendor).
79+
We keep a cached copy of dependencies within the `vendor/` directory,
80+
managing updates via [govendor](http://github.com/kardianos/govendor).
5081

51-
Pull requests should only include `vendor/` updates if they are part of the same change, be it a bugfix or a feature addition.
82+
Pull requests should only include `vendor/` updates if they are part of
83+
the same change, be it a bugfix or a feature addition.
5284

53-
The `vendor/` update needs to be justified as part of the PR description, and must be verified by the reviewers and/or merger to always reference an existing upstream commit.
85+
The `vendor/` update needs to be justified as part of the PR description,
86+
and must be verified by the reviewers and/or merger to always reference
87+
an existing upstream commit.
5488

5589
## Translation
5690

57-
We do all translation work inside [Crowdin](https://crowdin.com/project/gitea). The only translation that is maintained in this git repository is [`en_US.ini`](https://github.com/go-gitea/gitea/blob/master/options/locale/locale_en-US.ini) and is synced regularily to Crowdin. Once a translation has reached A SATISFACTORY PERCENTAGE it will be synced back into this repo and included in the next released version.
91+
We do all translation work inside [Crowdin](https://crowdin.com/project/gitea).
92+
The only translation that is maintained in this git repository is
93+
[`en_US.ini`](https://github.com/go-gitea/gitea/blob/master/options/locale/locale_en-US.ini)
94+
and is synced regularily to Crowdin. Once a translation has reached
95+
A SATISFACTORY PERCENTAGE it will be synced back into this repo and
96+
included in the next released version.
5897

5998
## Code review
6099

61-
Changes to Gitea must be reviewed before they are accepted, no matter who makes the change even if it is an owner or a maintainer. We use GitHub's pull request workflow to do that and we also use [LGTM](http://lgtm.co) to ensure every PR is reviewed by at least 2 maintainers.
100+
Changes to Gitea must be reviewed before they are accepted, no matter who
101+
makes the change even if it is an owner or a maintainer. We use GitHub's
102+
pull request workflow to do that and we also use [LGTM](http://lgtm.co)
103+
to ensure every PR is reviewed by at least 2 maintainers.
62104

63-
Please try to make your pull request easy to review for us. Please read the "[How to get faster PR reviews](https://github.com/kubernetes/community/blob/master/contributors/devel/faster_reviews.md)" guide, it has lots of useful tips for any project you may want to contribute. Some of the key points:
105+
Please try to make your pull request easy to review for us.
106+
Please read the [How to get faster PR reviews](https://github.com/kubernetes/community/blob/master/contributors/devel/faster_reviews.md) guide,
107+
it has lots of useful tips for any project you may want to contribute.
108+
Some of the key points:
64109

65-
* Make small pull requests. The smaller, the faster to review and the more likely it will be merged soon.
66-
* Don't make changes unrelated to your PR. Maybe there are typos on some comments, maybe refactoring would be welcome on a function... but if that is not related to your PR, please make *another* PR for that.
67-
* Split big pull requests into multiple small ones. An incremental change will be faster to review than a huge PR.
110+
* Make small pull requests. The smaller, the faster to review and the
111+
more likely it will be merged soon.
112+
* Don't make changes unrelated to your PR. Maybe there are typos on
113+
some comments, maybe refactoring would be welcome on a function... but
114+
if that is not related to your PR, please make *another* PR for that.
115+
* Split big pull requests into multiple small ones. An incremental change
116+
will be faster to review than a huge PR.
68117

69118
## Styleguide
70119

@@ -87,35 +136,82 @@ import (
87136

88137
## Sign your work
89138

90-
The sign-off is a simple line at the end of the explanation for the patch. Your signature certifies that you wrote the patch or otherwise have the right to pass it on as an open-source patch. The rules are pretty simple: If you can certify [DCO](DCO), then you just add a line to every git commit message:
139+
The sign-off is a simple line at the end of the explanation for the
140+
patch. Your signature certifies that you wrote the patch or otherwise
141+
have the right to pass it on as an open-source patch. The rules are
142+
pretty simple: If you can certify [DCO](DCO), then you just add a line
143+
to every git commit message:
91144

92145
```
93146
Signed-off-by: Joe Smith <[email protected]>
94147
```
95148

96-
Please use your real name, we really dislike pseudonyms or anonymous contributions. We are in the open-source world without secrets. If you set your `user.name` and `user.email` git configs, you can sign your commit automatically with `git commit -s`.
149+
Please use your real name, we really dislike pseudonyms or anonymous
150+
contributions. We are in the open-source world without secrets. If you
151+
set your `user.name` and `user.email` git configs, you can sign your
152+
commit automatically with `git commit -s`.
97153

98154
## Release Cycle
99155

100-
We adopted a release schedule to streamline the process of working on, finishing, and issuing releases. The overall goal is to make a minor release every two months, which breaks down into one month of general development followed by one month of testing and polishing known as the release freeze. All the feature pull requests should be merged in the first month of one release period and during the frozen period a corresponding release branch is open for fix backported from master. Release candidate are made along this period for user testing to obtain a final version that is maintained in this branch. A release is maintained by issuing patch releases to only correct critical problems such as crashes or security issues.
101-
102-
The current release cycle is aligned to start on December 25 to February 24, next is February 25 to April 24, and etc. On this cycle, we also maybe publish the previous release minor version. For example, the current release version is v1.1, but we maybe also publish v1.0.2. When we publish v1.2, then we will stop publish v1.0.3.
156+
We adopted a release schedule to streamline the process of working
157+
on, finishing, and issuing releases. The overall goal is to make a
158+
minor release every two months, which breaks down into one month of
159+
general development followed by one month of testing and polishing
160+
known as the release freeze. All the feature pull requests should be
161+
merged in the first month of one release period and during the frozen
162+
period a corresponding release branch is open for fix backported from
163+
master. Release candidate are made along this period for user testing to
164+
obtain a final version that is maintained in this branch. A release is
165+
maintained by issuing patch releases to only correct critical problems
166+
such as crashes or security issues.
167+
168+
The current release cycle is aligned to start on December 25 to February
169+
24, next is February 25 to April 24, and etc. On this cycle, we also
170+
maybe publish the previous release minor version. For example, the
171+
current release version is v1.1, but we maybe also publish v1.0.2. When
172+
we publish v1.2, then we will stop publish v1.0.3.
103173

104174
## Maintainers
105175

106-
To make sure every PR is checked, we have [team maintainers](MAINTAINERS). Every PR **MUST** be reviewed by at least two maintainers (or owners) before it can get merged. A maintainer should be a contributor of Gitea (or Gogs) and contributed at least 4 accepted PRs. A contributor should apply as a maintainer in the [Discord](https://discord.gg/NsatcWJ) #develop channel. The owners or the team maintainers may invite the contributor. A maintainer should spend some time on code reviews. If a maintainer has no time to do that, they should apply to leave the maintainers team and we will give them the honor of being a member of the [advisors team](https://github.com/orgs/go-gitea/teams/advisors). Of course, if an advisor has time to code review, we will gladly welcome them back to the maintainers team. If a maintainer is inactive for more than 3 months and forgets to leave the maintainers team, the owners may move him or her from the maintainers team to the advisors team.
176+
To make sure every PR is checked, we have [team
177+
maintainers](MAINTAINERS). Every PR **MUST** be reviewed by at least
178+
two maintainers (or owners) before it can get merged. A maintainer
179+
should be a contributor of Gitea (or Gogs) and contributed at least
180+
4 accepted PRs. A contributor should apply as a maintainer in the
181+
[Discord](https://discord.gg/NsatcWJ) #develop channel. The owners
182+
or the team maintainers may invite the contributor. A maintainer
183+
should spend some time on code reviews. If a maintainer has no
184+
time to do that, they should apply to leave the maintainers team
185+
and we will give them the honor of being a member of the [advisors
186+
team](https://github.com/orgs/go-gitea/teams/advisors). Of course, if
187+
an advisor has time to code review, we will gladly welcome them back
188+
to the maintainers team. If a maintainer is inactive for more than 3
189+
months and forgets to leave the maintainers team, the owners may move
190+
him or her from the maintainers team to the advisors team.
107191

108192
## Owners
109193

110-
Since Gitea is a pure community organization without any company support, to keep the development healthy we will elect three owners every year. All contributors may vote to elect up to three candidates, one of which will be the main owner, and the other two the assistant owners. When the new owners have been elected, the old owners will give up ownership to the newly elected owners. If an owner is unable to do so, the other owners will assist in ceding ownership to the newly elected owners.
194+
Since Gitea is a pure community organization without any company support,
195+
to keep the development healthy we will elect three owners every year. All
196+
contributors may vote to elect up to three candidates, one of which will
197+
be the main owner, and the other two the assistant owners. When the new
198+
owners have been elected, the old owners will give up ownership to the
199+
newly elected owners. If an owner is unable to do so, the other owners
200+
will assist in ceding ownership to the newly elected owners.
111201

112-
After the election, the new owners should proactively agree with our [CONTRIBUTING](CONTRIBUTING.md) requirements in the [Discord](https://discord.gg/NsatcWJ) #general channel. Below are the words to speak:
202+
After the election, the new owners should proactively agree
203+
with our [CONTRIBUTING](CONTRIBUTING.md) requirements in the
204+
[Discord](https://discord.gg/NsatcWJ) #general channel. Below are the
205+
words to speak:
113206

114207
```
115-
I'm honored to having been elected an owner of Gitea, I agree with [CONTRIBUTING](CONTRIBUTING.md). I will spend part of my time on Gitea and lead the development of Gitea.
208+
I'm honored to having been elected an owner of Gitea, I agree with
209+
[CONTRIBUTING](CONTRIBUTING.md). I will spend part of my time on Gitea
210+
and lead the development of Gitea.
116211
```
117212

118-
To honor the past owners, here's the history of the owners and the time they served:
213+
To honor the past owners, here's the history of the owners and the time
214+
they served:
119215

120216
* 2016-11-04 ~ 2017-12-31
121217
* [Lunny Xiao](https://github.com/lunny) <[email protected]>
@@ -124,9 +220,16 @@ To honor the past owners, here's the history of the owners and the time they ser
124220

125221
## Versions
126222

127-
Gitea has the `master` branch as a tip branch and has version branches such as `release/v0.9`. `release/v0.9` is a release branch and we will tag `v0.9.0` for binary download. If `v0.9.0` has bugs, we will accept pull requests on the `release/v0.9` branch and publish a `v0.9.1` tag, after bringing the bug fix also to the master branch.
223+
Gitea has the `master` branch as a tip branch and has version branches
224+
such as `release/v0.9`. `release/v0.9` is a release branch and we will
225+
tag `v0.9.0` for binary download. If `v0.9.0` has bugs, we will accept
226+
pull requests on the `release/v0.9` branch and publish a `v0.9.1` tag,
227+
after bringing the bug fix also to the master branch.
128228

129-
Since the `master` branch is a tip version, if you wish to use Gitea in production, please download the latest release tag version. All the branches will be protected via GitHub, all the PRs to every branch must be reviewed by two maintainers and must pass the automatic tests.
229+
Since the `master` branch is a tip version, if you wish to use Gitea
230+
in production, please download the latest release tag version. All the
231+
branches will be protected via GitHub, all the PRs to every branch must
232+
be reviewed by two maintainers and must pass the automatic tests.
130233

131234
## Copyright
132235

@@ -138,4 +241,6 @@ Code that you contribute should use the standard copyright header:
138241
// license that can be found in the LICENSE file.
139242
```
140243

141-
Files in the repository contain copyright from the year they are added to the year they are last changed. If the copyright author is changed, just paste the header below the old one.
244+
Files in the repository contain copyright from the year they are added
245+
to the year they are last changed. If the copyright author is changed,
246+
just paste the header below the old one.

0 commit comments

Comments
 (0)