Commit fa328808 authored by intrigeri's avatar intrigeri
Browse files

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.
parent c9e67474
......@@ -37,6 +37,14 @@
## Merge
<div class="note">
If the proposed change was submitted as a merge request on <a
href="">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.
Merge the branch with `--no-ff`:
- for a new feature: into `devel`
......@@ -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](
- 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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment