From: Rudolf Polzer <divverent@xonotic.org>
Date: Sat, 30 Aug 2014 09:40:20 +0000 (+0200)
Subject: Change the messages to mention gitlab.
X-Git-Tag: xonotic-v0.8.0~18
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=a4a05f7081761cbfc34d557cac45f35713f0c70c

Change the messages to mention gitlab.
---

diff --git a/misc/tools/all/config.subr b/misc/tools/all/config.subr
index dbad12b1..d360ba08 100644
--- a/misc/tools/all/config.subr
+++ b/misc/tools/all/config.subr
@@ -1,4 +1,5 @@
 devsite_url="http://dev.xonotic.org/"
+gitsite_url="http://gitlab.com/groups/xonotic/"
 
 allrepos()
 {
@@ -29,15 +30,15 @@ allmirrors()
 	"$@" http ''   http://us.git.xonotic.org/xonotic/  ''
 
 	# Gitlab host (divVerent).
-	"$@" http lab  https://gitlab.com/xonotic/         ''
-	"$@" ssh  lab  ssh://git@gitlab.com/xonotic/       ''
+	# Disabled because of https://gitlab.com/gitlab-com/support-forum/issues/15
+	"$@" http ''   https://gitlab.com/xonotic/         ''
 
 	# German host (divVerent).
 	"$@" git  de   git://de.git.xonotic.org/xonotic/   ''
 	"$@" http de   http://de.git.xonotic.org/xonotic/  ''
 
 	# Pushing destination (authoritative server; merlijn).
-	"$@" ssh  push ssh://xonotic@push.git.xonotic.org/ ''
+	"$@" ssh  push ssh://git@gitlab.com/xonotic/       ''
 }
 
 have_time=true
diff --git a/misc/tools/all/git.subr b/misc/tools/all/git.subr
index 26b768c3..b14a8b6f 100644
--- a/misc/tools/all/git.subr
+++ b/misc/tools/all/git.subr
@@ -459,9 +459,12 @@ case "$cmd" in
 			msg "can skip the following paragraph and already use the repository."
 			msg ""
 			msg "To get access, your key has to be approved first. For that, visit"
-			msg "$devsite_url, then log in, create a \"New Issue\" on"
-			msg "the \"Support\" tracker in the \"Repository\" category where you"
-			msg "apply for access and paste the following output into the issue:"
+			msg "$gitsite_url, then log in, enter the"
+			msg "\"xonotic\" project, create an \"Issue\" tagged \"Repository Access\""
+			msg "to apply for access and paste the following output into the issue:"
+			msg ""
+			msg "After that, go to your profile settings, \"SSH Keys\", \"Add SSH Key\""
+			msg "and paste the following output:"
 			msg ""
 			msg "`cat ~/.ssh/id_rsa.pub`"
 		elif [ -f ~/.ssh/id_dsa.pub ]; then
@@ -471,9 +474,12 @@ case "$cmd" in
 			msg "can skip the following paragraph and already use the repository."
 			msg ""
 			msg "To get access, your key has to be approved first. For that, visit"
-			msg "$devsite_url, then log in, create a \"New Issue\" on"
-			msg "the \"Support\" tracker in the \"Repository\" category where you"
-			msg "apply for access and paste the following output into the issue:"
+			msg "$gitsite_url, then log in, enter the"
+			msg "\"xonotic\" project, create an \"Issue\" tagged \"Repository Access\""
+			msg "to apply for access and paste the following output into the issue:"
+			msg ""
+			msg "After that, go to your profile settings, \"SSH Keys\", \"Add SSH Key\""
+			msg "and paste the following output:"
 			msg ""
 			msg "`cat ~/.ssh/id_dsa.pub`"
 		else
@@ -486,9 +492,12 @@ case "$cmd" in
 			ssh-keygen -t rsa -b 4096 -f ~/.ssh/id_rsa
 			msg ""
 			msg "To get access, your key has to be approved first. For that, visit"
-			msg "$devsite_url, then log in, create a \"New Issue\" on"
-			msg "the \"Support\" tracker in the \"Repository\" category where you"
-			msg "apply for access and paste the following output into the issue:"
+			msg "$gitsite_url, then log in, enter the"
+			msg "\"xonotic\" project, create an \"Issue\" tagged \"Repository Access\""
+			msg "to apply for access and paste the following output into the issue:"
+			msg ""
+			msg "After that, go to your profile settings, \"SSH Keys\", \"Add SSH Key\""
+			msg "and paste the following output:"
 			msg ""
 			msg "`cat ~/.ssh/id_rsa.pub`"
 		fi