From a5df43673cfb0f6df0a3a3a3842b4c672501e55e Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Tue, 10 Jan 2023 00:04:41 -0800 Subject: [PATCH 1/8] Swap order to match GitLab UI --- docs/gitlab.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/gitlab.md b/docs/gitlab.md index 58975b6cd..480976f0c 100644 --- a/docs/gitlab.md +++ b/docs/gitlab.md @@ -9,8 +9,8 @@ configuration: 1. [Create an OAuth application][gitlab-oauth]. This can be at the user, group or instance level. Specify a name and use a redirect URI of `http://127.0.0.1/`. -_Unselect_ the 'Confidential' option. Set the 'write_repository' and -'read_repository' scopes. +_Unselect_ the 'Confidential' option. Set the 'read_repository' and +'write_repository' scopes. 1. Copy the application ID and configure `git config --global credential.https://gitlab.example.com.GitLabDevClientId ` 1. Copy the application secret and configure From 97f4ebd5eb9187e88be121c891b5b9cd42e3179b Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Tue, 10 Jan 2023 00:06:27 -0800 Subject: [PATCH 2/8] Update gitlab.md --- docs/gitlab.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/gitlab.md b/docs/gitlab.md index 480976f0c..f3ff77954 100644 --- a/docs/gitlab.md +++ b/docs/gitlab.md @@ -2,7 +2,7 @@ Git Credential Manager supports [gitlab.com][gitlab] out the box. -## Using on a another instance +## Using on another instance To use on another instance, eg. `https://gitlab.example.com` requires setup and configuration: From bb09f617b0b0bb0b541a8f79fd749eb75834f47e Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Tue, 10 Jan 2023 00:11:14 -0800 Subject: [PATCH 3/8] Update gitlab.md --- docs/gitlab.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/gitlab.md b/docs/gitlab.md index f3ff77954..7dbd0418e 100644 --- a/docs/gitlab.md +++ b/docs/gitlab.md @@ -17,7 +17,7 @@ _Unselect_ the 'Confidential' option. Set the 'read_repository' and `git config --global credential.https://gitlab.example.com.GitLabDevClientSecret ` 1. Configure authentication modes to include 'browser' -`git config --global credential.https://gitlab.example.com.gitLabAuthModes browser` +`git config --global credential.https://gitlab.example.com.GitLabAuthModes browser` 1. For good measure, configure `git config --global credential.https://gitlab.example.com.provider gitlab`. This may be necessary to recognise the domain as a GitLab instance. @@ -74,7 +74,7 @@ If you have a preferred authentication mode, you can specify [credential.gitLabAuthModes][config-gitlab-auth-modes]: ```console -git config --global credential.gitlabauthmodes browser +git config --global credential.GitLabAuthModes browser ``` ## Caveats From b71abb1cddb10260cf5b90174cdfc513af62ce3a Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Tue, 10 Jan 2023 00:25:40 -0800 Subject: [PATCH 4/8] Update gitlab.md --- docs/gitlab.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/gitlab.md b/docs/gitlab.md index 7dbd0418e..0ff00ce78 100644 --- a/docs/gitlab.md +++ b/docs/gitlab.md @@ -9,8 +9,7 @@ configuration: 1. [Create an OAuth application][gitlab-oauth]. This can be at the user, group or instance level. Specify a name and use a redirect URI of `http://127.0.0.1/`. -_Unselect_ the 'Confidential' option. Set the 'read_repository' and -'write_repository' scopes. +_Unselect_ the 'Confidential' option. Set the 'write_repository' scope. 1. Copy the application ID and configure `git config --global credential.https://gitlab.example.com.GitLabDevClientId ` 1. Copy the application secret and configure From f7d50a2eeaebd1ed523191fa9739371a2631deda Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Tue, 10 Jan 2023 00:28:03 -0800 Subject: [PATCH 5/8] Update gitlab.md --- docs/gitlab.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/gitlab.md b/docs/gitlab.md index 0ff00ce78..7dbd0418e 100644 --- a/docs/gitlab.md +++ b/docs/gitlab.md @@ -9,7 +9,8 @@ configuration: 1. [Create an OAuth application][gitlab-oauth]. This can be at the user, group or instance level. Specify a name and use a redirect URI of `http://127.0.0.1/`. -_Unselect_ the 'Confidential' option. Set the 'write_repository' scope. +_Unselect_ the 'Confidential' option. Set the 'read_repository' and +'write_repository' scopes. 1. Copy the application ID and configure `git config --global credential.https://gitlab.example.com.GitLabDevClientId ` 1. Copy the application secret and configure From b091365e102ce3e9b6334523b97d61afb3758b5a Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Tue, 10 Jan 2023 00:40:14 -0800 Subject: [PATCH 6/8] Update gitlab.md --- docs/gitlab.md | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/gitlab.md b/docs/gitlab.md index 7dbd0418e..e13a4a98e 100644 --- a/docs/gitlab.md +++ b/docs/gitlab.md @@ -12,12 +12,12 @@ or instance level. Specify a name and use a redirect URI of `http://127.0.0.1/`. _Unselect_ the 'Confidential' option. Set the 'read_repository' and 'write_repository' scopes. 1. Copy the application ID and configure -`git config --global credential.https://gitlab.example.com.GitLabDevClientId ` +`git config --global credential.https://gitlab.example.com.gitLabDevClientId ` 1. Copy the application secret and configure -`git config --global credential.https://gitlab.example.com.GitLabDevClientSecret +`git config --global credential.https://gitlab.example.com.gitLabDevClientSecret ` 1. Configure authentication modes to include 'browser' -`git config --global credential.https://gitlab.example.com.GitLabAuthModes browser` +`git config --global credential.https://gitlab.example.com.gitLabAuthModes browser` 1. For good measure, configure `git config --global credential.https://gitlab.example.com.provider gitlab`. This may be necessary to recognise the domain as a GitLab instance. @@ -27,8 +27,8 @@ This may be necessary to recognise the domain as a GitLab instance. ### Clearing config ```console - git config --global --unset-all credential.https://gitlab.example.com.GitLabDevClientId - git config --global --unset-all credential.https://gitlab.example.com.GitLabDevClientSecret + git config --global --unset-all credential.https://gitlab.example.com.gitLabDevClientId + git config --global --unset-all credential.https://gitlab.example.com.gitLabDevClientSecret git config --global --unset-all credential.https://gitlab.example.com.provider ``` @@ -39,23 +39,23 @@ instances, provided by community member [hickford](https://github.com/hickford/) ```console # https://gitlab.freedesktop.org/ -git config --global credential.https://gitlab.freedesktop.org.gitlabdevclientid 6503d8c5a27187628440d44e0352833a2b49bce540c546c22a3378c8f5b74d45 -git config --global credential.https://gitlab.freedesktop.org.gitlabdevclientsecret 2ae9343a034ff1baadaef1e7ce3197776b00746a02ddf0323bb34aca8bff6dc1 +git config --global credential.https://gitlab.freedesktop.org.gitLabDevClientId 6503d8c5a27187628440d44e0352833a2b49bce540c546c22a3378c8f5b74d45 +git config --global credential.https://gitlab.freedesktop.org.gitLabDevClientSecret 2ae9343a034ff1baadaef1e7ce3197776b00746a02ddf0323bb34aca8bff6dc1 # https://gitlab.gnome.org/ -git config --global credential.https://gitlab.gnome.org.gitlabdevclientid adf21361d32eddc87bf6baf8366f242dfe07a7d4335b46e8e101303364ccc470 -git config --global credential.https://gitlab.gnome.org.gitlabdevclientsecret cdca4678f64e5b0be9febc0d5e7aab0d81d27696d7adb1cf8022ccefd0a58fc0 +git config --global credential.https://gitlab.gnome.org.gitLabDevClientId adf21361d32eddc87bf6baf8366f242dfe07a7d4335b46e8e101303364ccc470 +git config --global credential.https://gitlab.gnome.org.gitLabDevClientSecret cdca4678f64e5b0be9febc0d5e7aab0d81d27696d7adb1cf8022ccefd0a58fc0 # https://invent.kde.org/ -git config --global credential.https://invent.kde.org.gitlabdevclientid cd7cb4342c7cd83d8c2fcc22c87320f88d0bde14984432ffca07ee24d0bf0699 -git config --global credential.https://invent.kde.org.gitlabdevclientsecret 9cc8440b280c792ac429b3615ae1c8e0702e6b2479056f899d314f05afd94211 +git config --global credential.https://invent.kde.org.gitLabDevClientId cd7cb4342c7cd83d8c2fcc22c87320f88d0bde14984432ffca07ee24d0bf0699 +git config --global credential.https://invent.kde.org.gitLabDevClientSecret 9cc8440b280c792ac429b3615ae1c8e0702e6b2479056f899d314f05afd94211 # https://salsa.debian.org/ -git config --global credential.https://salsa.debian.org.gitlabdevclientid 213f5fd32c6a14a0328048c0a77cc12c19138cc165ab957fb83d0add74656f89 -git config --global credential.https://salsa.debian.org.gitlabdevclientsecret 3616b974b59451ecf553f951cb7b8e6e3c91c6d84dd3247dcb0183dac93c2a26 +git config --global credential.https://salsa.debian.org.gitLabDevClientId 213f5fd32c6a14a0328048c0a77cc12c19138cc165ab957fb83d0add74656f89 +git config --global credential.https://salsa.debian.org.gitLabDevClientSecret 3616b974b59451ecf553f951cb7b8e6e3c91c6d84dd3247dcb0183dac93c2a26 # https://gitlab.haskell.org/ -git config --global credential.https://gitlab.haskell.org.gitlabdevclientid 57de5eaab72b3dc447fca8c19cea39527a08e82da5377c2d10a8ebb30b08fa5f -git config --global credential.https://gitlab.haskell.org.gitlabdevclientsecret 5170a480da8fb7341e0daac94223d4fff549c702efb2f8873d950bb2b88e434f +git config --global credential.https://gitlab.haskell.org.gitLabDevClientId 57de5eaab72b3dc447fca8c19cea39527a08e82da5377c2d10a8ebb30b08fa5f +git config --global credential.https://gitlab.haskell.org.gitLabDevClientSecret 5170a480da8fb7341e0daac94223d4fff549c702efb2f8873d950bb2b88e434f # https://code.videolan.org/ -git config --global credential.https://code.videolan.org.gitlabdevclientid f35c379241cc20bf9dffecb47990491b62757db4fb96080cddf2461eacb40375 -git config --global credential.https://code.videolan.org.gitlabdevclientsecret 631558ec973c5ef65b78db9f41103f8247dc68d979c86f051c0fe4389e1995e8 +git config --global credential.https://code.videolan.org.gitLabDevClientId f35c379241cc20bf9dffecb47990491b62757db4fb96080cddf2461eacb40375 +git config --global credential.https://code.videolan.org.gitLabDevClientSecret 631558ec973c5ef65b78db9f41103f8247dc68d979c86f051c0fe4389e1995e8 ``` See also [issue #677](https://github.com/GitCredentialManager/git-credential-manager/issues/677). @@ -74,7 +74,7 @@ If you have a preferred authentication mode, you can specify [credential.gitLabAuthModes][config-gitlab-auth-modes]: ```console -git config --global credential.GitLabAuthModes browser +git config --global credential.gitLabAuthModes browser ``` ## Caveats From c7ed1395cd0d1feab5976a7f51b305c2d5dd185f Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Tue, 10 Jan 2023 00:42:27 -0800 Subject: [PATCH 7/8] Update gitlab.md --- docs/gitlab.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/gitlab.md b/docs/gitlab.md index e13a4a98e..1ec7cb01c 100644 --- a/docs/gitlab.md +++ b/docs/gitlab.md @@ -16,7 +16,7 @@ _Unselect_ the 'Confidential' option. Set the 'read_repository' and 1. Copy the application secret and configure `git config --global credential.https://gitlab.example.com.gitLabDevClientSecret ` -1. Configure authentication modes to include 'browser' +1. Optional if you want to force OAuth: `git config --global credential.https://gitlab.example.com.gitLabAuthModes browser` 1. For good measure, configure `git config --global credential.https://gitlab.example.com.provider gitlab`. From cf55a1cea7fc6f8ecb88f7f48cc9c1138b2e635d Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Fri, 20 Jan 2023 15:16:35 -0800 Subject: [PATCH 8/8] Update gitlab.md --- docs/gitlab.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/gitlab.md b/docs/gitlab.md index 1ec7cb01c..04b122e1c 100644 --- a/docs/gitlab.md +++ b/docs/gitlab.md @@ -16,7 +16,7 @@ _Unselect_ the 'Confidential' option. Set the 'read_repository' and 1. Copy the application secret and configure `git config --global credential.https://gitlab.example.com.gitLabDevClientSecret ` -1. Optional if you want to force OAuth: +1. Optional if you want to force browser auth: `git config --global credential.https://gitlab.example.com.gitLabAuthModes browser` 1. For good measure, configure `git config --global credential.https://gitlab.example.com.provider gitlab`.