funkwhale/.gitlab/merge_request_templates/Merge request.md

Please avoid merging the base branch into your feature branch. We are working with rebases and those merged tend to cause trouble. 
For further questions, join us at Matrix: https://matrix.to/#/#funkwhale-dev:matrix.org

Related issue: #XXX <!-- it's okay to have no issue for small changes -->

This Merge Request includes:

- [ ] Tests
- [ ] A changelog fragment (cf https://docs.funkwhale.audio/contributing.html#changelog-management)
Add a hint to merge requests template about rebases 2021-10-21 06:28:31 +00:00			`Please avoid merging the base branch into your feature branch. We are working with rebases and those merged tend to cause trouble.`
			`For further questions, join us at Matrix: https://matrix.to/#/#funkwhale-dev:matrix.org`

Added a merge request template and more documentation about the changelog 2018-08-31 17:47:13 +00:00			`Related issue: #XXX <!-- it's okay to have no issue for small changes -->`

			`This Merge Request includes:`

			`- [ ] Tests`
			`- [ ] A changelog fragment (cf https://docs.funkwhale.audio/contributing.html#changelog-management)`