From 3d2138812cf5cebc986762b3ce099e6b6f370825 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Mon, 28 Nov 2016 14:27:59 +0100 Subject: [PATCH 1/7] Unified editorconfig accross all projects --- .editorconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.editorconfig b/.editorconfig index 008b61ed6..12b242448 100644 --- a/.editorconfig +++ b/.editorconfig @@ -11,17 +11,17 @@ trim_trailing_whitespace = true indent_style = tab indent_size = 8 -[*.tmpl] -indent_style = tab -indent_size = 2 - -[Makefile] +[*.{tmpl,html}] indent_style = tab +indent_size = 4 [*.{less,yml}] indent_style = space -indent_size = 2 +indent_size = 4 [*.js] indent_style = space indent_size = 4 + +[Makefile] +indent_style = tab From 9628d4fb4405b1d6dfddd43ec8dd65c8dc163424 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Mon, 28 Nov 2016 14:28:40 +0100 Subject: [PATCH 2/7] Unified GitHub templates accross all projects --- .github/ISSUE_TEMPLATE.md | 24 ------------------------ .github/PULL_REQUEST_TEMPLATE.md | 10 ---------- .github/issue_template.md | 19 +++++++++++++++++++ .github/pull_request_template.md | 7 +++++++ 4 files changed, 26 insertions(+), 34 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE.md delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md create mode 100644 .github/issue_template.md create mode 100644 .github/pull_request_template.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index f5fb775bd..000000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,24 +0,0 @@ - -1. Please speak English -2. Please ask questions or config/deploy problems - on our gitter channel: https://gitter.im/go-gitea/gitea - Here are bugs and feature requests only. -3. Please take a moment to search that an issue doesn't already exist. -4. Please give all relevant information below for bug reports; incomplete - details considered invalid report. - -**You MUST delete above content including this line before posting; -too lazy to take this action considered invalid report.** - -- Gitea version (or commit ref): -- Git version: -- Operating system: -- Database (use `[x]`): - - [ ] PostgreSQL - - [ ] MySQL - - [ ] SQLite -- Log gist: - -## Description - -... diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 380150422..000000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,10 +0,0 @@ -Please check the following: - -1. Make sure you are targeting the `master` branch. -2. Read contributing guidelines: - https://github.com/go-gitea/gitea/blob/master/CONTRIBUTING.md -3. Describe what your pull request does and which issue - you're targeting (if any) - -**You MUST delete above content including this line before posting; -too lazy to take this action considered invalid pull request.** diff --git a/.github/issue_template.md b/.github/issue_template.md new file mode 100644 index 000000000..ec619ded5 --- /dev/null +++ b/.github/issue_template.md @@ -0,0 +1,19 @@ +1. Please speak English, this is the language everybody of us can speak and write. +2. Please ask questions or config/deploy problems on our Gitter channel: https://gitter.im/go-gitea/gitea +3. Please take a moment to search that an issue doesn't already exist. +4. Please give all relevant information below for bug reports, incomplete details will be handled as an invalid report. + +**You MUST delete the content above including this line before posting, otherwise your pull request will be invalid.** + +- Gitea version (or commit ref): +- Git version: +- Operating system: +- Database (use `[x]`): + - [ ] PostgreSQL + - [ ] MySQL + - [ ] SQLite +- Log gist: + +## Description + +... diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 000000000..702062490 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,7 @@ +Please check the following: + +1. Make sure you are targeting the `master` branch, pull requests on release branches are only allowed for bug fixes. +2. Read contributing guidelines: https://github.com/go-gitea/gitea/blob/master/CONTRIBUTING.md +3. Describe what your pull request does and which issue you're targeting (if any) + +**You MUST delete the content above including this line before posting, otherwise your pull request will be invalid.** From c2044e5b394ddfc2fe402c9f3936f9235e59519f Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Mon, 28 Nov 2016 14:34:06 +0100 Subject: [PATCH 3/7] Dropped always outdated contributors file, link to it the graph on readme --- CONTRIBUTORS | 9 --------- README.md | 13 +++++++++---- 2 files changed, 9 insertions(+), 13 deletions(-) delete mode 100644 CONTRIBUTORS diff --git a/CONTRIBUTORS b/CONTRIBUTORS deleted file mode 100644 index 65db51945..000000000 --- a/CONTRIBUTORS +++ /dev/null @@ -1,9 +0,0 @@ -Andrey Nering (@andreynering) -Kim Carlbäcker (@bkcsoft) -LefsFlare (@LefsFlarey) -Lunny Xiao (@lunny) -Rachid Zarouali (@xinity) -Rémy Boulanouar (@DblK) -Sandro Santilli (@strk) -Thibault Meyer (@0xbaadf00d) -Thomas Boerger (@tboerger) diff --git a/README.md b/README.md index 414d7e23f..1fb489785 100644 --- a/README.md +++ b/README.md @@ -122,11 +122,16 @@ How to install Gitea: - Thanks [DigitalOcean](https://www.digitalocean.com) for hosting home and demo sites. - Thanks [KeyCDN](https://www.keycdn.com/) and [QiNiu](http://www.qiniu.com/) for providing CDN service. -## Contributors -- See [Maintainer](https://github.com/orgs/go-gitea/people) -- See [Contributors](https://github.com/go-gitea/gitea/graphs/contributors) for full list of contributors. -- See [Translators](conf/locale/TRANSLATORS) for public list of translators. +## Contributing + +Fork -> Patch -> Push -> Pull Request + +## Authors + +* [Maintainers](https://github.com/orgs/go-gitea/people) +* [Contributors](https://github.com/go-gitea/gitea/graphs/contributors) +* [Translators](conf/locale/TRANSLATORS) ## License From caac5fb99d70e6c2ca551d9bcb36c54e724a91ad Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Mon, 28 Nov 2016 14:35:04 +0100 Subject: [PATCH 4/7] Updated maintainers file to latest status --- MAINTAINERS | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 9a54274d7..3b18bcb59 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1,4 +1,6 @@ -Andrey Nering (@andreynering) +Alexey Makhov (@makhov) +Andrey Nering (@andreynering) +Bwko (@Bwko) Kim Carlbäcker (@bkcsoft) LefsFlare (@LefsFlarey) Lunny Xiao (@lunny) @@ -6,5 +8,5 @@ Matthias Loibl (@metalmatze) Rachid Zarouali (@xinity) Rémy Boulanouar (@DblK) Sandro Santilli (@strk) -Thibault Meyer (@0xbaadf00d) +Thibault Meyer (@0xbaadf00d) Thomas Boerger (@tboerger) From 91d6c715ea3323cd4b06d21c1aae20364a47a2a0 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Mon, 28 Nov 2016 14:35:55 +0100 Subject: [PATCH 5/7] Dropped new lines from contributing, some rewording and reformatting --- CONTRIBUTING.md | 156 ++++++++---------------------------------------- 1 file changed, 25 insertions(+), 131 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 752e02015..fc0b240af 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,185 +2,79 @@ ## Introduction -This document explains how to contribute changes to the Gitea -project. It assumes you have followed the [installation -instructions](https://github.com/go-gitea/docs/tree/master/en-US/installation) - -Sensitive security-related issues should be reported to -[security@gitea.io](mailto:security@gitea.io). +This document explains how to contribute changes to the Gitea project. It assumes you have followed the [installation instructions](https://github.com/go-gitea/docs/tree/master/en-US/installation). Sensitive security-related issues should be reported to [security@gitea.io](mailto:security@gitea.io). ## Bug reports -Please search the issues on the issue tracker with a variety of keywords -to ensure your bug is not already reported. +Please search the issues on the issue tracker with a variety of keywords to ensure your bug is not already reported. -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. +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. -The burden is on you to convince us that it is actually a bug -in Gitea. This is easiest to do when you 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 will be able to help you. Check out [How to Report Bugs -Effectively](http://www.chiark.greenend.org.uk/~sgtatham/bugs.html). +The burden is on you to convince us that it is actually a bug in Gitea. This is easiest to do when you 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 will be able to help you. Check out [How to Report Bugs Effectively](http://www.chiark.greenend.org.uk/~sgtatham/bugs.html). -Please be kind, remember that Gitea comes at no cost to you, and you're -getting free help. +Please be kind, remember that Gitea comes at no cost to you, and you're getting free help. ## Discuss your design -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. +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. -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. +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. -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. +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. ## Testing redux -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: - -After running for a while, the command should print - -``` -ALL TESTS PASSED -``` -## Vendoring - -We keep a cached copy of dependencies within the `vendor/` directory, -managing updates via [govendor](http://github.com/kardianos/govendor). - -Pull requests should only include `vendor/` updates if they are -part of the same change, be it a bugfix or a feature addition. - -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. +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, follow [these instructions](http://readme.drone.io/0.5/install/cli/). After that you can simply call `drone exec` within you working directory and it will try to run the test suite locally. ## Code review -Changes to Gitea must be reviewed before they are accepted, no matter -who makes the change even if an owners or a maintainer. We use github's -pull request workflow to do that and use [lgtm](http://lgtm.co) to ensure -every PR is reviewed by at least 2 maintainers. - -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/kubernetes/blob/master/docs/devel/faster_reviews.md), -guide, it got useful tips for any project you may want to contribute. See some -of the points: - -- Make small pull requests. The smaller, the faster to review and the more - likely it will be merged soon. -- Don't make changes unrelated to your PR. Maybe there are typos on some - comments, maybe refactoring would welcome on a function... but if that is not - related to you PR, please make *another* PR for that. -- Split big pull requests in multiple. An incremental change will be faster to - review than a huge PR. +Changes to Gitea must be reviewed before they are accepted, no matter who makes the change even if 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. ## Sign your work -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: +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: ``` Signed-off-by: Joe Smith ``` -Please use your real name, we really dislike pseudonyms or anonymous -contributions. We are in the opensource world without secrets. If you -set your `user.name` and `user.email` git configs, you can sign your -commit automatically with `git commit -s`. - -## Contributors - -Everyone who sent a PR to Gitea that gets accepted will -be as a contributor. Please send a PR to add your name to -[CONTRIBUTORS](CONTRIBUTORS). For the format, see the -[CONTRIBUTORS](CONTRIBUTORS). +Please use your real name, we really dislike pseudonyms or anonymous contributions. We are in the opensource world without secrets. If you set your `user.name` and `user.email` git configs, you can sign your commit automatically with `git commit -s`. ## Maintainers -To make sure every PR have been checked, we make a team maintainers. Any -PR MUST be reviewed and by at least two maintainers before it can -get merged. Maintainers should be a contributor of gitea(or gogs) and -contributed at least 4 accepted PRs. And a contributor should apply as a -maintainer in [gitter Gitea develop](https://gitter.im/go-gitea/develop). -And the owners or the team maintainer could invite the contributor. A -maintainer should spend some time on code reviews. If some maintainer -have no time to do that, he should apply to leave maintainers team and -we will give him an honor to be as a member of advisor team. Of course, -if an advisor have time to code view, welcome it back to maintainers team. -If some one have no time to code view and forget to leave the maintainers, -the owners have the power to move him from maintainers team to advisors -team. +To make sure every PR have been checked, we got team maintainers. Any PR MUST be reviewed and by at least two maintainers before it can get merged. Maintainers should be a contributor of Gitea (or Gogs) and contributed at least 4 accepted PRs. A contributor should apply as a maintainer in [Gitter development channel](https://gitter.im/go-gitea/develop). The owners or the team maintainers could invite the contributor. A maintainer should spend some time on code reviews. If some maintainer have no time to do that, he should apply to leave the maintainers team and we will give him an honor to be as a member of advisor team. Of course, if an advisor have time to code view, welcome it back to maintainers team. If someone have no time to code review and forget to leave the maintainers team, the owners have the power to move him from maintainers team to advisors team. ## Owners -Since Gitea is a pure community organization without any company -support, to keep the development healthly We will elect the owners every -year. Every time we will elect three owners. All the contributers could -vote for three owners, one is the main owner, the other two are assistant -owners. When the new owners have been elected, the old owners MUST move -the power to the new owners. If some owner don't obey these rules, -the other owners are allowed to revoke his owner status. +Since Gitea is a pure community organization without any company support, to keep the development healthly we will elect the owners every year. Every time we will elect three owners. All the contributers could vote for three owners, one is the main owner, the other two are assistant owners. When the new owners have been elected, the old owners MUST move the power to the new owners. If some owner don't obey these rules, the other owners are allowed to revoke his owner status. -After the election, the new owners should say he agrees with these -rules on the [CONTRIBUTING](CONTRIBUTING.md) on the [Gitter Gitea -Channel](https://gitter.im/go-gitea/gitea). Below is the word to speak +After the election, the new owners should say he agrees with these rules on the [CONTRIBUTING](CONTRIBUTING.md) on the [Gitter main channel](https://gitter.im/go-gitea/gitea). Below are the words to speak: ``` -I'm glad to be 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. +I'm glad to be 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. ``` -For a honor to the owners, this document will add the history owners -below: +For a honor to the owners, this document will add the history owners below: -2016-11-04 ~ 2017-12-31 - -- lunny -- tboerger -- bkcsoft +* 2016-11-04 ~ 2017-12-31 + * [Lunny Xiao](https://github.com/lunny) + * [Thomas Boerger](https://github.com/tboerger) + * [Kim Carlbäcker](https://github.com/bkcsoft) ## Versions -Gitea has one master as a tip branch and have many version branch -such as v0.9. v0.9 is a release branch and we will tag v0.9.0 both for -binary download. If v0.9.0 have some bugs, we will accept PR on v0.9 -and publish v0.9.1 and merge bug PR to master. +Gitea has one master as a tip branch and have version branches such as `v0.9`. `v0.9` is a release branch and we will tag `v0.9.0` for binary download. If `v0.9.0` got some bug, we will accept pull requests on the `v0.9` branch and publish a `v0.9.1` tag, afterwards we will port the bug fix also to the master branch. -Branch master is a tip version, so if you wish a production usage, -please download the latest release tag version. All the branch will be -protected via github, All the PRs to all the branches should be review -by two maintainers and pass the automatic tests. +The `master` branch is a tip version, so if you wish a production usage, please download the latest release tag version. All the branches will be protected via github, all the PRs to all the branches should be review by two maintainers and pass the automatic tests. ## Copyright Code that you contribute should use the standard copyright header: ``` -// Copyright 2016 - 2017 The Gitea Authors. All rights reserved. +// Copyright 2016 The Gitea Authors. All rights reserved. // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. ``` -Files in the repository are copyright the year they are added and the -year they are last changed. If the copyright author is changed, just -copy the head below the old one. +Files in the repository are copyright the year they are added and the year they are last changed. If the copyright author is changed, just copy the head below the old one. From b3abc2775f7b7d1815c7776eee26982f4c49a638 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Mon, 28 Nov 2016 14:36:35 +0100 Subject: [PATCH 6/7] Dropped more or less useless files --- .gitattributes | 11 ----------- .mailmap | 2 -- 2 files changed, 13 deletions(-) delete mode 100644 .gitattributes delete mode 100644 .mailmap diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 09dfc210f..000000000 --- a/.gitattributes +++ /dev/null @@ -1,11 +0,0 @@ -public/conf/gitignore/* linguist-vendored -public/conf/license/* linguist-vendored -public/assets/* linguist-vendored -public/plugins/* linguist-vendored -public/plugins/* linguist-vendored -public/css/themes/* linguist-vendored -public/css/github.min.css linguist-vendored -public/css/semantic-2.2.1.min.css linguist-vendored -public/js/libs/* linguist-vendored -public/js/jquery-1.11.3.min.js linguist-vendored -public/js/semantic-2.2.1.min.js linguist-vendored \ No newline at end of file diff --git a/.mailmap b/.mailmap deleted file mode 100644 index 88ff1591a..000000000 --- a/.mailmap +++ /dev/null @@ -1,2 +0,0 @@ -Unknwon -Unknwon 无闻 From 8def53ffcce755db5c9ef7e160f202fe576fa586 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Mon, 28 Nov 2016 16:57:42 +0100 Subject: [PATCH 7/7] Add a pragraph to the k8s PR guide to contributors guide --- CONTRIBUTING.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fc0b240af..11e0d73d4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -30,6 +30,12 @@ Before sending code out for review, run all the tests for the whole tree to make Changes to Gitea must be reviewed before they are accepted, no matter who makes the change even if 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. +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/kubernetes/blob/master/docs/devel/faster_reviews.md)" guide, it got useful tips for any project you may want to contribute. See some of the points: + +* Make small pull requests. The smaller, the faster to review and the more likely it will be merged soon. +* Don't make changes unrelated to your PR. Maybe there are typos on some comments, maybe refactoring would welcome on a function... but if that is not related to you PR, please make *another* PR for that. +* Split big pull requests in multiple. An incremental change will be faster to review than a huge PR. + ## Sign your work 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: