summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-04-04 09:29:10 +0000
committerintrigeri <intrigeri@boum.org>2019-04-04 09:29:10 +0000
commitfa3288083b2feae3ae19a7af414ced89e9533eb5 (patch)
treedb31288d848714f7c44e928a90b0a4180888217e
parentc9e67474050a6f564b74d94980a8813a98ce4f7d (diff)
Branch submit & review: make room for doing reviews on Salsa (refs: #15186).
Some teams want to experiment and start using GitLab for code reviews, let's allow it and see how it goes.
-rw-r--r--wiki/src/contribute/merge_policy/review.mdwn8
-rw-r--r--wiki/src/contribute/merge_policy/submit.mdwn3
2 files changed, 10 insertions, 1 deletions
diff --git a/wiki/src/contribute/merge_policy/review.mdwn b/wiki/src/contribute/merge_policy/review.mdwn
index 957c314..add0fdc 100644
--- a/wiki/src/contribute/merge_policy/review.mdwn
+++ b/wiki/src/contribute/merge_policy/review.mdwn
@@ -37,6 +37,14 @@
## Merge
+<div class="note">
+If the proposed change was submitted as a merge request on <a
+href="https://salsa.debian.org/tails-team/tails">Salsa</a>, don't
+click <i>Merge</i> there: while we can use GitLab for reviews, our
+infrastructure is not ready to consume merge operations done there, so
+you need to merge on the command line.
+</div>
+
Merge the branch with `--no-ff`:
- for a new feature: into `devel`
diff --git a/wiki/src/contribute/merge_policy/submit.mdwn b/wiki/src/contribute/merge_policy/submit.mdwn
index adff779..a6e4d74 100644
--- a/wiki/src/contribute/merge_policy/submit.mdwn
+++ b/wiki/src/contribute/merge_policy/submit.mdwn
@@ -10,7 +10,8 @@ When you think it is good enough and have tested it, you have to:
- 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 to your branch.
+- 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