summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-04-05 10:20:07 +0000
committerintrigeri <intrigeri@boum.org>2019-04-05 10:20:07 +0000
commit6ec6253a11496c495db0d8caf4916f4816accf01 (patch)
tree99de4e02bf8502b0e34bddc91a175b866e463966
parentbd8cd79ca7e611b4211c58d353c8f653fd114f8c (diff)
Revert "One needs to push to Salsa as well in order to create a MR."
I was wrong, thanks hefee for correcting me: a developer with commit access to our canonical repo can very well push there, which will propagate to the Salsa mirror repo, and then browse the Salsa web UI to click "Create merge request". This reverts commit bd8cd79ca7e611b4211c58d353c8f653fd114f8c.
-rw-r--r--wiki/src/contribute/merge_policy/submit.mdwn3
1 files changed, 1 insertions, 2 deletions
diff --git a/wiki/src/contribute/merge_policy/submit.mdwn b/wiki/src/contribute/merge_policy/submit.mdwn
index a367a46..29c406e 100644
--- a/wiki/src/contribute/merge_policy/submit.mdwn
+++ b/wiki/src/contribute/merge_policy/submit.mdwn
@@ -9,8 +9,7 @@ When you think it is good enough and have tested it, you have to:
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) and to your personal fork
- of the [Tails repository on Salsa](https://salsa.debian.org/tails-team/tails).
+ 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