Skip to content

Commit f52b9df

Browse files
authored
Provide bug report template (#21)
1 parent 8c228f9 commit f52b9df

File tree

6 files changed

+92
-17
lines changed

6 files changed

+92
-17
lines changed

.github/ISSUE_TEMPLATE.md

-15
This file was deleted.

.github/ISSUE_TEMPLATE/bug_report.md

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
name: Bug report
3+
about: You have encountered a bug
4+
---
5+
6+
## Environment
7+
8+
* Operating System: [FILL HERE]
9+
* Toolchain (compiler + version): [FILL HERE]
10+
* Version or commit: [FILL HERE]
11+
12+
## Expected Behaviour
13+
14+
## Actual Behaviour
15+
16+
## Instructions for reproduction

.github/PULL_REQUEST_TEMPLATE.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
## Proposed changes
2+
3+
## Contributor checklist
4+
5+
- [ ] My PR is related to \<insert ticket number>
6+
- [ ] I have read and understood the [CONTRIBUTING guide](https://github.com/flora-pm/flora-server/blob/development/CONTRIBUTING.md)
7+
- [ ] I have inserted my change and a link to this PR in the [CHANGELOG](https://github.com/flora-pm/flora-server/blob/development/CHANGELOG.md)

CODE_OF_CONDUCT.md

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Conduct
2+
3+
* We are committed to providing a friendly, safe and welcoming environment for all, regardless of level of experience,
4+
gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age,
5+
religion, nationality, or other similar characteristic.
6+
7+
* Please avoid using overtly sexual aliases or other nicknames that might detract from a friendly, safe
8+
and welcoming environment for all.
9+
10+
* Please be kind and courteous. There’s no need to be mean or rude.
11+
12+
* Respect that people have differences of opinion and that every design or implementation choice carries a trade-off
13+
and numerous costs. There is seldom a right answer.
14+
15+
* Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with,
16+
make a fork and see how it works.
17+
18+
* We will exclude you from interaction if you insult, demean or harass anyone. That is not welcome behavior.
19+
We interpret the term “harassment” as including the definition in the [Citizen Code of Conduct][CCC];
20+
if you have any lack of clarity about what might be included in that concept, please read their definition.
21+
In particular, we don’t tolerate behavior that excludes people in socially marginalized groups.
22+
23+
* Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or
24+
made uncomfortable by a community member, please contact one of the channel ops or any of the
25+
[Flora moderation team][Moderation team] immediately. Whether you’re a regular contributor or a newcomer,
26+
we care about making this community a safe place for you and we’ve got your back.
27+
28+
* Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome.
29+
30+
31+
_Adapted from the [Rust Lang][Rust CoC]'s code of conduct_
32+
33+
[CCC]: https://github.com/stumpsyn/policies/blob/master/citizen_code_of_conduct.md
34+
[Rust CoC]: https://www.rust-lang.org/policies/code-of-conduct
35+
[Moderation team]: mailto://[email protected]

CONTRIBUTING.md

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
Thank you for your contribution to Flora! There is no Contributor License Agreement (CLA) to sign,
2+
but we need you to read this document when you open your PR or your issue:
3+
4+
## Contributing
5+
6+
We need you to read and acknowledge our [Code of Conduct][CoC] document.
7+
8+
### Pull Requests
9+
10+
You need to
11+
12+
* Read this document
13+
* Have a ticket that you can relate the PR to, so that we can have some context for your change
14+
* Provide screenshots of before/after if you change the UI.
15+
16+
### Feature request
17+
18+
Open a thread in the [Feature Request][Feature Request board] discussion board.
19+
Be certain to search if it has already been suggested!
20+
21+
### Questions
22+
23+
Open a thread in the [Questions][Questions board] discussion board. You'll get help from everyone in the community.
24+
25+
### Issues & Bugs
26+
27+
Open a [Ticket][Ticket] and tell us what you can about your problem.
28+
29+
[CoC]: https://github.com/flora-pm/flora-server/blob/master/CODE_OF_CONDUCT.md
30+
[Feature Request board]: https://github.com/flora-pm/flora-server/discussions/new?category=feature-requests
31+
[Questions board]: https://github.com/flora-pm/flora-server/discussions/categories/questions
32+
[Ticket]: https://github.com/flora-pm/flora-server/issues/new

src/Data/Aeson/Orphans.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ module Data.Aeson.Orphans where
33

44
import Data.Aeson
55
import qualified Data.Text as T
6-
import qualified Distribution.SPDX.License as SPDX
7-
import qualified Distribution.Pretty as Pretty
86
import Distribution.Parsec (simpleParsec)
7+
import qualified Distribution.Pretty as Pretty
8+
import qualified Distribution.SPDX.License as SPDX
99

1010
instance FromJSON SPDX.License where
1111
parseJSON = withText "SPDX License" $ \s ->

0 commit comments

Comments
 (0)