diff options
| author | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2020-03-19 19:25:50 +0100 |
|---|---|---|
| committer | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2020-03-19 19:25:50 +0100 |
| commit | a8aa91753024dbd211e5e3952f5b305debaa8b55 (patch) | |
| tree | 01088f8cec46c4b437b338cb78aaaee65e5d8bc7 /.gitlab | |
| parent | c1fd4f665335ba67336bd1b2fab2d9df5e247e08 (diff) | |
| parent | 952cb589f47972bba8f9b94b2935a60f05e21bd3 (diff) | |
| download | pleroma-a8aa91753024dbd211e5e3952f5b305debaa8b55.tar.gz pleroma-a8aa91753024dbd211e5e3952f5b305debaa8b55.zip | |
Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/issue_templates/Bug.md | 20 | ||||
| -rw-r--r-- | .gitlab/merge_request_templates/Release.md | 5 |
2 files changed, 25 insertions, 0 deletions
diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md new file mode 100644 index 000000000..66fbc510e --- /dev/null +++ b/.gitlab/issue_templates/Bug.md @@ -0,0 +1,20 @@ +<!-- +### Precheck + +* For support use https://git.pleroma.social/pleroma/pleroma-support or [community channels](https://git.pleroma.social/pleroma/pleroma#community-channels). +* Please do a quick search to ensure no similar bug has been reported before. If the bug has not been addressed after 2 weeks, it's fine to bump it. +* Try to ensure that the bug is actually related to the Pleroma backend. For example, if a bug happens in Pleroma-FE but not in Mastodon-FE or mobile clients, it's likely that the bug should be filed in [Pleroma-FE](https://git.pleroma.social/pleroma/pleroma-fe/issues/new) repository. +--> + +### Environment + +* Installation type: + - [ ] OTP + - [ ] From source +* Pleroma version (could be found in the "Version" tab of settings in Pleroma-FE): +* Elixir version (`elixir -v` for from source installations, N/A for OTP): +* Operating system: +* PostgreSQL version (`postgres -V`): + + +### Bug description diff --git a/.gitlab/merge_request_templates/Release.md b/.gitlab/merge_request_templates/Release.md new file mode 100644 index 000000000..237f74e00 --- /dev/null +++ b/.gitlab/merge_request_templates/Release.md @@ -0,0 +1,5 @@ +### Release checklist +* [ ] Bump version in `mix.exs` +* [ ] Compile a changelog +* [ ] Create an MR with an announcement to pleroma.social +* [ ] Tag the release |