Change the messages to mention gitlab.

diff --git a/misc/tools/all/config.subr b/misc/tools/all/config.subr
index dbad12b1ab335f59066551c4a276081b06e92d4f..d360ba084bfbb1d019cd619807d73b5a233748e3 100644 (file)
--- a/misc/tools/all/config.subr
+++ b/misc/tools/all/config.subr
@@ -1,4 +1,5 @@
 devsite_url="http://dev.xonotic.org/"
 devsite_url="http://dev.xonotic.org/"

+gitsite_url="http://gitlab.com/groups/xonotic/"

 
 allrepos()
 {
 
 allrepos()
 {


@@ -29,15 +30,15 @@ allmirrors()
        "$@" http ''   http://us.git.xonotic.org/xonotic/  ''
 
        # Gitlab host (divVerent).
        "$@" 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).
 
        # 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
 }
 
 have_time=true

diff --git a/misc/tools/all/git.subr b/misc/tools/all/git.subr
index 26b768c30478cd87988797ddb6ae8383dd7c3dad..b14a8b6f1acd8e0f67443f7a211fcdf3c80fa3af 100644 (file)
--- 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 "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
                        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 "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
                        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"
                        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
                        msg ""
                        msg "`cat ~/.ssh/id_rsa.pub`"
                fi