From ed68f0c0a0950598f349646d82e94377837eaad9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 13 Apr 2016 14:49:01 -0400 Subject: [PATCH] webapp: Update url to add gitlab.com ssh key. (Psst GitLab.. cool urls don't change!) --- debian/changelog | 2 ++ doc/bugs/gitlab_configuration_out_of_date.mdwn | 1 + ...comment_1_39c4a952e79fc711700bd5eff8fb9c13._comment | 10 ++++++++++ templates/configurators/gitlab.com/add.hamlet | 4 ++-- 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 doc/bugs/gitlab_configuration_out_of_date/comment_1_39c4a952e79fc711700bd5eff8fb9c13._comment diff --git a/debian/changelog b/debian/changelog index acabb254f9..de83ad34df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ git-annex (6.20160413) UNRELEASED; urgency=medium desirable, especially when the user is just opening the webapp from a dekstop menu which happens to run it in $HOME, the webapp will now not treat such a $HOME git repository as a git-annex repository. + * webapp: Update url to add gitlab.com ssh key. + (Psst GitLab.. cool urls don't change!) -- Joey Hess Wed, 13 Apr 2016 13:30:32 -0400 diff --git a/doc/bugs/gitlab_configuration_out_of_date.mdwn b/doc/bugs/gitlab_configuration_out_of_date.mdwn index 1e7399ecbf..7fb02b5b76 100644 --- a/doc/bugs/gitlab_configuration_out_of_date.mdwn +++ b/doc/bugs/gitlab_configuration_out_of_date.mdwn @@ -15,3 +15,4 @@ Attempt to use the webapp to create a new gitlab remote. Git-annex is a miracle to find. I intend to stick with it, migrate my life to it, and perhaps learn haskell some day to contribute. +> [[fixed|done]] --[[Joey]] diff --git a/doc/bugs/gitlab_configuration_out_of_date/comment_1_39c4a952e79fc711700bd5eff8fb9c13._comment b/doc/bugs/gitlab_configuration_out_of_date/comment_1_39c4a952e79fc711700bd5eff8fb9c13._comment new file mode 100644 index 0000000000..f64b5da914 --- /dev/null +++ b/doc/bugs/gitlab_configuration_out_of_date/comment_1_39c4a952e79fc711700bd5eff8fb9c13._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2016-04-13T18:47:57Z" + content=""" +Seems the url has changed to https://gitlab.com/profile/keys + +Using this new url to add a key, I was able to successfully add a gitlab +repository. +"""]] diff --git a/templates/configurators/gitlab.com/add.hamlet b/templates/configurators/gitlab.com/add.hamlet index 91342ab35e..24bb6e2704 100644 --- a/templates/configurators/gitlab.com/add.hamlet +++ b/templates/configurators/gitlab.com/add.hamlet @@ -22,8 +22,8 @@ \ You need to configure GitLab to accept a SSH public key.

Open a tab to # - - https://gitlab.com/profile/keys/new + + https://gitlab.com/profile/keys and copy and paste this public key into it: 

                 #{pubkey}