Difference between revisions of "Merge Requests"
Jump to navigation
Jump to search
(title + description) |
|||
| Line 11: | Line 11: | ||
[[File:Allow commits from members marked.png]] | [[File:Allow commits from members marked.png]] | ||
== Title == | |||
Give your merge request a meaningful title. Not too long, details can go in the description. | |||
== Description == | |||
Give your merge request a meaningful description which helps other developers to review and approve your code. In particular, "what" and "how" should be addressed. | |||
If the MR fixes bug <code>#1234</code>, include this line (automatically closes the issue): | |||
<source> | |||
Fixes https://gitlab.com/inkscape/inkscape/-/issues/1234 | |||
</source> | |||
If the MR is not fixing a bug but e.g. implementing a feature request with corresponding issue <code>#1234</code>, include: | |||
<source> | |||
Closes https://gitlab.com/inkscape/inkscape/-/issues/1234 | |||
</source> | |||
[[Category:Developer Documentation]] | [[Category:Developer Documentation]] | ||
Latest revision as of 14:12, 7 November 2020
This page is about gitlab merge request configuration.
CI Timeout
Set the CI Timeout to 3h in your fork's settings at
https://gitlab.com/<your_username>/inkscape/-/settings/ci_cd
under the first heading 'General pipelines'.
Allow Rebasing
Enable "Allow commits from members who can merge to the target branch", this allows us to rebase your branch before merging.
Title
Give your merge request a meaningful title. Not too long, details can go in the description.
Description
Give your merge request a meaningful description which helps other developers to review and approve your code. In particular, "what" and "how" should be addressed.
If the MR fixes bug #1234, include this line (automatically closes the issue):
Fixes https://gitlab.com/inkscape/inkscape/-/issues/1234If the MR is not fixing a bug but e.g. implementing a feature request with corresponding issue #1234, include:
Closes https://gitlab.com/inkscape/inkscape/-/issues/1234