summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-04-04 17:34:26 +0000
committerintrigeri <intrigeri@boum.org>2019-04-04 17:34:26 +0000
commit323ab25c36519d65d0ed66ebc78ff7bc5df12f39 (patch)
tree99de4e02bf8502b0e34bddc91a175b866e463966
parent05f742e96a7c013d03e3dc2c00e1f724d7672a25 (diff)
Number list: order matters here.
-rw-r--r--wiki/src/contribute/merge_policy/submit.mdwn56
1 files changed, 28 insertions, 28 deletions
diff --git a/wiki/src/contribute/merge_policy/submit.mdwn b/wiki/src/contribute/merge_policy/submit.mdwn
index a54f623..29c406e 100644
--- a/wiki/src/contribute/merge_policy/submit.mdwn
+++ b/wiki/src/contribute/merge_policy/submit.mdwn
@@ -7,34 +7,34 @@ branch name, e.g. `bugfix/7173-upgrade-syslinux`.
When you think it is good enough and have tested it, you have to:
-- Push your branch
- - If you have commit access to the official Tails Git repository,
- push your branch there so our CI picks it up.
- - Else, push to your personal Git repository:
- [fork us on Salsa](https://salsa.debian.org/tails-team/tails).
-- Set the ticket's *Status* field to *In Progress* (if you do not see
- this field when editing the ticket, ask the [[sysadmin team|contribute/working_together/roles/sysadmins]]
- to grant you the necessary permissions).
-- Point the ticket's *Feature Branch* field either to your branch
- or to a merge request on [Salsa](https://salsa.debian.org/tails-team/tails).
-- Set the ticket's *Target version* field to the release you would
- like your changes to be in.
-- If you have access to our Jenkins instance (if you don't know what
- this means, you do not) please make sure that your branch has not
- broken any tests! Or, if you only want a first review of your code,
- without bothering with the build & test status on Jenkins, that's fine:
- make it clear to the reviewer what you expect and
- that your branch is not ready to merge.
-- Set the ticket's *QA Check* field to *Ready for QA*.
-- Assign the ticket to nobody (aka. unassign it from yourself) by
- default. Unless it's clear to you that nobody on the
- [[Foundations Team|working_together/roles/foundations_team]] will be
- able or willing to do this specific review; in that case, _you_ shall try
- to find someone else to do the review, and assign the ticket
- to them.
-- For important changes, if you feel the need to ask input from the
- greater development community, notify the [[tails-dev@boum.org|about/contact#tails-dev]]
- mailing list.
+1. Push your branch
+ - If you have commit access to the official Tails Git repository,
+ push your branch there so our CI picks it up.
+ - Else, push to your personal Git repository:
+ [fork us on Salsa](https://salsa.debian.org/tails-team/tails).
+2. Set the ticket's *Status* field to *In Progress* (if you do not see
+ this field when editing the ticket, ask the [[sysadmin team|contribute/working_together/roles/sysadmins]]
+ to grant you the necessary permissions).
+3. Point the ticket's *Feature Branch* field either to your branch
+ or to a merge request on [Salsa](https://salsa.debian.org/tails-team/tails).
+4. Set the ticket's *Target version* field to the release you would
+ like your changes to be in.
+5. If you have access to our Jenkins instance (if you don't know what
+ this means, you do not) please make sure that your branch has not
+ broken any tests! Or, if you only want a first review of your code,
+ without bothering with the build & test status on Jenkins, that's fine:
+ make it clear to the reviewer what you expect and
+ that your branch is not ready to merge.
+6. Set the ticket's *QA Check* field to *Ready for QA*.
+7. Assign the ticket to nobody (aka. unassign it from yourself) by
+ default. Unless it's clear to you that nobody on the
+ [[Foundations Team|working_together/roles/foundations_team]] will be
+ able or willing to do this specific review; in that case, _you_ shall try
+ to find someone else to do the review, and assign the ticket
+ to them.
+8. For important changes, if you feel the need to ask input from the
+ greater development community, notify the [[tails-dev@boum.org|about/contact#tails-dev]]
+ mailing list.
Then, if the [[reviewer|contribute/merge_policy/review]] asks for more
development to be done before