diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-08-07 09:04:49 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-08-07 09:04:49 -0700 |
| commit | 4f1997a05a3d8d8eb04949888eff4c6a92de1bc3 (patch) | |
| tree | ee4654944cfa7a5609ef54569301e975a03c2c74 /doc/topics | |
| parent | 971c1061b22ac921c32d194dd67b67819d1ac74d (diff) | |
| parent | 8d659869e1d8ef4a844ea03890f42cb80f312fa0 (diff) | |
| download | gitlab-ce-44496-save-project-id.tar.gz | |
Merge branch 'master' into 44496-save-project-id44496-save-project-id
Diffstat (limited to 'doc/topics')
| -rw-r--r-- | doc/topics/authentication/index.md | 2 | ||||
| -rw-r--r-- | doc/topics/git/useful_git_commands.md | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/topics/authentication/index.md b/doc/topics/authentication/index.md index 8b4a2f1630b..ad196e27f53 100644 --- a/doc/topics/authentication/index.md +++ b/doc/topics/authentication/index.md @@ -23,7 +23,7 @@ This page gathers all the resources for the topic **Authentication** within GitL - [How to Configure LDAP with GitLab CE](../../administration/auth/how_to_configure_ldap_gitlab_ce/index.md) - [How to Configure LDAP with GitLab EE](../../administration/auth/how_to_configure_ldap_gitlab_ee/index.md) **(STARTER)** - [Feature Highlight: LDAP Integration](https://about.gitlab.com/2014/07/10/feature-highlight-ldap-sync/) - - [Debugging LDAP](https://about.gitlab.com/handbook/support/workflows/support-engineering/ldap/debugging_ldap.html) + - [Debugging LDAP](https://about.gitlab.com/handbook/support/workflows/debugging_ldap.html) - **Integrations:** - [OmniAuth](../../integration/omniauth.md) - [Authentiq OmniAuth Provider](../../administration/auth/authentiq.md#authentiq-omniauth-provider) diff --git a/doc/topics/git/useful_git_commands.md b/doc/topics/git/useful_git_commands.md index 84406805350..030e62f485a 100644 --- a/doc/topics/git/useful_git_commands.md +++ b/doc/topics/git/useful_git_commands.md @@ -149,7 +149,7 @@ gitk --follow <file> ### Use a custom SSH key for a git command -```text +```sh GIT_SSH_COMMAND="ssh -i ~/.ssh/gitlabadmin" git <command> ``` @@ -157,13 +157,13 @@ GIT_SSH_COMMAND="ssh -i ~/.ssh/gitlabadmin" git <command> With SSH: -```text +```sh GIT_SSH_COMMAND="ssh -vvv" git clone <git@url> ``` With HTTPS: -```text +```sh GIT_TRACE_PACKET=1 GIT_TRACE=2 GIT_CURL_VERBOSE=1 git clone <url> ``` |