Commit 56566997 authored by Tails translators's avatar Tails translators
Browse files

Merge remote-tracking branch 'origin/master'

parents 2c8027e7 3c6c928f
......@@ -80,7 +80,7 @@ Anyone can check it out like this:
Developers with write access to the repositories should instead:
git clone boum_org_amnesia@webmasters.boum.org:wiki.git
torsocks git clone gitolite@d53ykjpeekuikgoq.onion:tails
And then, in any case, in your new Git clone's directory:
......@@ -191,7 +191,7 @@ Anyone can check it out like this:
Developers with write access to the repositories should instead:
git clone boum_org_amnesia@webmasters.boum.org:promotion-material.git
torsocks git clone gitolite@d53ykjpeekuikgoq.onion:promotion-material
We have a [web interface](https://git-tails.immerda.ch/promotion-material/)
available for the promotion material repository.
......@@ -370,12 +370,5 @@ Troubleshooting
First, check with your team-mates: in some cases they can help you
troubleshoot your problem, and confirm whether the problem is on your
side or on the server side. If that is not enough, read on.
* For repositories hosted at `git-tails.immerda.ch` (aka.
`git.tails.boum.org`) or at `git.puppet.tails.boum.org`: get in
touch with
[[Tails system administrators|about/contact#tails-sysadmins]].
* For repositories hosted at `webmasters.boum.org`: get in touch with
<root@boum.org>.
side or on the server side. If that is not enough, get in touch with
the [[Tails system administrators|about/contact#tails-sysadmins]].
......@@ -1422,8 +1422,8 @@ this, and skip what does not make sense for a RC.
git fetch && \
git submodule update && \
bare_repo=$(mktemp -d)
git clone --bare --reference "${MASTER_CHECKOUT:?}" \
boum_org_amnesia@webmasters.boum.org:wiki.git \
torsocks git clone --bare --reference "${MASTER_CHECKOUT:?}" \
gitolite@d53ykjpeekuikgoq.onion:tails \
"${bare_repo:?}" && \
PYTHONPATH=lib/python3 ./bin/delete-merged-git-branches \
--repo "${bare_repo:?}" && \
......
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