summaryrefslogtreecommitdiff
path: root/doc/integration
diff options
context:
space:
mode:
Diffstat (limited to 'doc/integration')
-rw-r--r--doc/integration/gitlab.md4
-rw-r--r--doc/integration/google.md2
-rw-r--r--doc/integration/jenkins.md2
-rw-r--r--doc/integration/kerberos.md6
-rw-r--r--doc/integration/oauth2_generic.md2
-rw-r--r--doc/integration/recaptcha.md2
-rw-r--r--doc/integration/salesforce.md2
-rw-r--r--doc/integration/saml.md2
-rw-r--r--doc/integration/shibboleth.md4
9 files changed, 13 insertions, 13 deletions
diff --git a/doc/integration/gitlab.md b/doc/integration/gitlab.md
index e8c104bbe6f..36810e7c513 100644
--- a/doc/integration/gitlab.md
+++ b/doc/integration/gitlab.md
@@ -15,7 +15,7 @@ GitLab.com will generate an application ID and secret key for you to use.
- Name: This can be anything. Consider something like `<Organization>'s GitLab` or `<Your Name>'s GitLab` or something else descriptive.
- Redirect URI:
- ```
+ ```plaintext
http://your-gitlab.example.com/import/gitlab/callback
http://your-gitlab.example.com/users/auth/gitlab/callback
```
@@ -63,7 +63,7 @@ GitLab.com will generate an application ID and secret key for you to use.
For installations from source:
- ```
+ ```yaml
- { name: 'gitlab', app_id: 'YOUR_APP_ID',
app_secret: 'YOUR_APP_SECRET',
args: { scope: 'api' } }
diff --git a/doc/integration/google.md b/doc/integration/google.md
index 38cc33e3971..ee7e7fd6193 100644
--- a/doc/integration/google.md
+++ b/doc/integration/google.md
@@ -28,7 +28,7 @@ In Google's side:
- **Authorized redirect URIs** - Enter your domain name followed by the
callback URIs one at a time:
- ```
+ ```plaintext
https://gitlab.example.com/users/auth/google_oauth2/callback
https://gitlab.example.com/-/google_api/auth/callback
```
diff --git a/doc/integration/jenkins.md b/doc/integration/jenkins.md
index 9f3a52cf4ef..77912a543d0 100644
--- a/doc/integration/jenkins.md
+++ b/doc/integration/jenkins.md
@@ -160,7 +160,7 @@ in the `gitlab.rb` config file, followed by the [`gitlab-ctl reconfigure` comman
If you don't find the errors above, but do find *duplicate* entries like below (in `/var/log/gitlab/gitlab-rail`), this
could also indicate that [webhook requests are timing out](../user/project/integrations/webhooks.md#receiving-duplicate-or-multiple-webhook-requests-triggered-by-one-event):
-```
+```plaintext
2019-10-25_04:22:41.25630 2019-10-25T04:22:41.256Z 1584 TID-ovowh4tek WebHookWorker JID-941fb7f40b69dff3d833c99b INFO: start
2019-10-25_04:22:41.25630 2019-10-25T04:22:41.256Z 1584 TID-ovowh4tek WebHookWorker JID-941fb7f40b69dff3d833c99b INFO: start
```
diff --git a/doc/integration/kerberos.md b/doc/integration/kerberos.md
index 68cf193a434..b77f7a952aa 100644
--- a/doc/integration/kerberos.md
+++ b/doc/integration/kerberos.md
@@ -33,7 +33,7 @@ system's Kerberos settings.
The keytab is a sensitive file and must be readable by the GitLab user. Set
ownership and protect the file appropriately:
-```
+```shell
sudo chown git /etc/http.keytab
sudo chmod 0600 /etc/http.keytab
```
@@ -243,7 +243,7 @@ With Kerberos SPNEGO authentication, the browser is expected to send a list of
mechanisms it supports to GitLab. If it doesn't support any of the mechanisms
GitLab supports, authentication will fail with a message like this in the log:
-```
+```plaintext
OmniauthKerberosSpnegoController: failed to process Negotiate/Kerberos authentication: gss_accept_sec_context did not return GSS_S_COMPLETE: An unsupported mechanism was requested Unknown error
```
@@ -282,7 +282,7 @@ fatal: Authentication failed for '<KRB5 path>'
If you are using Git v2.11 or newer and see the above error when cloning, you can
set the `http.emptyAuth` Git option to `true` to fix this:
-```
+```shell
git config --global http.emptyAuth true
```
diff --git a/doc/integration/oauth2_generic.md b/doc/integration/oauth2_generic.md
index c53c5751f1f..7fd96d727b5 100644
--- a/doc/integration/oauth2_generic.md
+++ b/doc/integration/oauth2_generic.md
@@ -26,7 +26,7 @@ This strategy is designed to allow configuration of the simple OmniAuth SSO proc
The redirect URI you provide when registering the application should be:
- ```
+ ```plaintext
http://your-gitlab.host.com/users/auth/oauth2_generic/callback
```
diff --git a/doc/integration/recaptcha.md b/doc/integration/recaptcha.md
index 10613129490..4f3140e4cb9 100644
--- a/doc/integration/recaptcha.md
+++ b/doc/integration/recaptcha.md
@@ -23,7 +23,7 @@ user logins via passwords, the `X-GitLab-Show-Login-Captcha` HTTP header must
be set. For example, in NGINX, this can be done via the `proxy_set_header`
configuration variable:
-```
+```nginx
proxy_set_header X-GitLab-Show-Login-Captcha 1;
```
diff --git a/doc/integration/salesforce.md b/doc/integration/salesforce.md
index d0e25ae2d44..5272e9fd5e5 100644
--- a/doc/integration/salesforce.md
+++ b/doc/integration/salesforce.md
@@ -60,7 +60,7 @@ To get the credentials (a pair of Client ID and Client Secret), you must [create
For installation from source:
- ```
+ ```yaml
- { name: 'salesforce',
app_id: 'SALESFORCE_CLIENT_ID',
app_secret: 'SALESFORCE_CLIENT_SECRET'
diff --git a/doc/integration/saml.md b/doc/integration/saml.md
index 3597fe6df1e..b4f5bfda8c5 100644
--- a/doc/integration/saml.md
+++ b/doc/integration/saml.md
@@ -129,7 +129,7 @@ To ease configuration, most IdP accept a metadata URL for the application to pro
configuration information to the IdP. To build the metadata URL for GitLab, append
`users/auth/saml/metadata` to the HTTPS URL of your GitLab installation, for instance:
-```
+```plaintext
https://gitlab.example.com/users/auth/saml/metadata
```
diff --git a/doc/integration/shibboleth.md b/doc/integration/shibboleth.md
index 4cc686cc0b6..8c456e7d3d1 100644
--- a/doc/integration/shibboleth.md
+++ b/doc/integration/shibboleth.md
@@ -66,7 +66,7 @@ The following changes are needed to enable Shibboleth:
The file should look like this:
- ```
+ ```ruby
external_url 'https://gitlab.example.com'
gitlab_rails['internal_api_url'] = 'https://gitlab.example.com'
@@ -101,7 +101,7 @@ On the sign in page, there should now be a "Sign in with: Shibboleth" icon below
The order of the first 2 Location directives is important. If they are reversed,
you will not get a Shibboleth session!
-```
+```plaintext
<Location />
Require all granted
ProxyPassReverse http://127.0.0.1:8181