Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
0881c145
Commit
0881c145
authored
Oct 02, 2020
by
Marcel Amirault
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean up yaml code block formatting
Fix spacing, indentation, comments, etc
parent
3e8137fe
Changes
18
Show whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
118 additions
and
110 deletions
+118
-110
doc/administration/redis/replication_and_failover_external.md
...administration/redis/replication_and_failover_external.md
+6
-6
doc/administration/redis/troubleshooting.md
doc/administration/redis/troubleshooting.md
+3
-3
doc/integration/cas.md
doc/integration/cas.md
+4
-4
doc/integration/facebook.md
doc/integration/facebook.md
+1
-1
doc/integration/github.md
doc/integration/github.md
+13
-11
doc/integration/gitlab.md
doc/integration/gitlab.md
+4
-3
doc/integration/google.md
doc/integration/google.md
+4
-3
doc/integration/kerberos.md
doc/integration/kerberos.md
+2
-1
doc/integration/omniauth.md
doc/integration/omniauth.md
+13
-13
doc/integration/salesforce.md
doc/integration/salesforce.md
+1
-1
doc/integration/saml.md
doc/integration/saml.md
+38
-38
doc/integration/twitter.md
doc/integration/twitter.md
+2
-1
doc/operations/metrics/alerts.md
doc/operations/metrics/alerts.md
+2
-1
doc/operations/metrics/dashboards/panel_types.md
doc/operations/metrics/dashboards/panel_types.md
+1
-1
doc/topics/autodevops/index.md
doc/topics/autodevops/index.md
+1
-1
doc/user/clusters/agent/index.md
doc/user/clusters/agent/index.md
+18
-18
doc/user/project/clusters/add_remove_clusters.md
doc/user/project/clusters/add_remove_clusters.md
+1
-1
doc/user/project/clusters/serverless/aws.md
doc/user/project/clusters/serverless/aws.md
+4
-3
No files found.
doc/administration/redis/replication_and_failover_external.md
View file @
0881c145
doc/administration/redis/troubleshooting.md
View file @
0881c145
doc/integration/cas.md
View file @
0881c145
...
@@ -48,7 +48,7 @@ To enable the CAS OmniAuth provider you must register your application with your
...
@@ -48,7 +48,7 @@ To enable the CAS OmniAuth provider you must register your application with your
url
:
'
CAS_SERVER'
,
url
:
'
CAS_SERVER'
,
login_url
:
'
/CAS_PATH/login'
,
login_url
:
'
/CAS_PATH/login'
,
service_validate_url
:
'
/CAS_PATH/p3/serviceValidate'
,
service_validate_url
:
'
/CAS_PATH/p3/serviceValidate'
,
logout_url
:
'
/CAS_PATH/logout'
}
}
logout_url
:
'
/CAS_PATH/logout'
}
}
```
```
1.
Change 'CAS_PATH' to the root of your CAS instance (ie.
`cas`
).
1.
Change 'CAS_PATH' to the root of your CAS instance (ie.
`cas`
).
...
...
doc/integration/facebook.md
View file @
0881c145
doc/integration/github.md
View file @
0881c145
...
@@ -78,7 +78,8 @@ Follow these steps to incorporate the GitHub OAuth 2 app in your GitLab server:
...
@@ -78,7 +78,8 @@ Follow these steps to incorporate the GitHub OAuth 2 app in your GitLab server:
For GitHub Enterprise:
For GitHub Enterprise:
```
yaml
```
yaml
-
{
name
:
'
github'
,
app_id
:
'
YOUR_APP_ID'
,
-
{
name
:
'
github'
,
app_id
:
'
YOUR_APP_ID'
,
app_secret
:
'
YOUR_APP_SECRET'
,
app_secret
:
'
YOUR_APP_SECRET'
,
url
:
"
https://github.example.com/"
,
url
:
"
https://github.example.com/"
,
args
:
{
scope
:
'
user:email'
}
}
args
:
{
scope
:
'
user:email'
}
}
...
@@ -125,7 +126,8 @@ omnibus_gitconfig['system'] = { "http" => ["sslVerify = false"] }
...
@@ -125,7 +126,8 @@ omnibus_gitconfig['system'] = { "http" => ["sslVerify = false"] }
For installation from source:
For installation from source:
```
yaml
```
yaml
-
{
name
:
'
github'
,
app_id
:
'
YOUR_APP_ID'
,
-
{
name
:
'
github'
,
app_id
:
'
YOUR_APP_ID'
,
app_secret
:
'
YOUR_APP_SECRET'
,
app_secret
:
'
YOUR_APP_SECRET'
,
url
:
"
https://github.example.com/"
,
url
:
"
https://github.example.com/"
,
verify_ssl
:
false
,
verify_ssl
:
false
,
...
...
doc/integration/gitlab.md
View file @
0881c145
...
@@ -63,7 +63,8 @@ GitLab.com will generate an application ID and secret key for you to use.
...
@@ -63,7 +63,8 @@ GitLab.com will generate an application ID and secret key for you to use.
For installations from source:
For installations from source:
```
yaml
```
yaml
-
{
name
:
'
gitlab'
,
app_id
:
'
YOUR_APP_ID'
,
-
{
name
:
'
gitlab'
,
app_id
:
'
YOUR_APP_ID'
,
app_secret
:
'
YOUR_APP_SECRET'
,
app_secret
:
'
YOUR_APP_SECRET'
,
args
:
{
scope
:
'
api'
}
}
args
:
{
scope
:
'
api'
}
}
```
```
...
...
doc/integration/google.md
View file @
0881c145
...
@@ -84,7 +84,8 @@ On your GitLab server:
...
@@ -84,7 +84,8 @@ On your GitLab server:
For installations from source:
For installations from source:
```
yaml
```
yaml
-
{
name
:
'
google_oauth2'
,
app_id
:
'
YOUR_APP_ID'
,
-
{
name
:
'
google_oauth2'
,
app_id
:
'
YOUR_APP_ID'
,
app_secret
:
'
YOUR_APP_SECRET'
,
app_secret
:
'
YOUR_APP_SECRET'
,
args
:
{
access_type
:
'
offline'
,
approval_prompt
:
'
'
}
}
args
:
{
access_type
:
'
offline'
,
approval_prompt
:
'
'
}
}
```
```
...
...
doc/integration/kerberos.md
View file @
0881c145
...
@@ -207,6 +207,7 @@ remove the OmniAuth provider named `kerberos` from your `gitlab.yml` /
...
@@ -207,6 +207,7 @@ remove the OmniAuth provider named `kerberos` from your `gitlab.yml` /
```
yaml
```
yaml
omniauth
:
omniauth
:
# Rest of configuration omitted
# ...
# ...
providers
:
providers
:
-
{
name
:
'
kerberos'
}
# <-- remove this line
-
{
name
:
'
kerberos'
}
# <-- remove this line
...
...
doc/integration/omniauth.md
View file @
0881c145
...
@@ -142,7 +142,7 @@ The chosen OmniAuth provider is now active and can be used to sign in to GitLab
...
@@ -142,7 +142,7 @@ The chosen OmniAuth provider is now active and can be used to sign in to GitLab
## Automatically Link Existing Users to OmniAuth Users
## Automatically Link Existing Users to OmniAuth Users
> [Introduced
in GitLab 13.4.](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36664)
> [Introduced
](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36664) in GitLab 13.4.
You can automatically link OmniAuth users with existing GitLab users if their email addresses match.
You can automatically link OmniAuth users with existing GitLab users if their email addresses match.
For example, the following setting is used to enable the auto link feature for both a SAML provider and the Twitter OAuth provider:
For example, the following setting is used to enable the auto link feature for both a SAML provider and the Twitter OAuth provider:
...
...
doc/integration/salesforce.md
View file @
0881c145
doc/integration/saml.md
View file @
0881c145
doc/integration/twitter.md
View file @
0881c145
...
@@ -65,7 +65,8 @@ To enable the Twitter OmniAuth provider you must register your application with
...
@@ -65,7 +65,8 @@ To enable the Twitter OmniAuth provider you must register your application with
For installations from source:
For installations from source:
```
yaml
```
yaml
-
{
name
:
'
twitter'
,
app_id
:
'
YOUR_APP_ID'
,
-
{
name
:
'
twitter'
,
app_id
:
'
YOUR_APP_ID'
,
app_secret
:
'
YOUR_APP_SECRET'
}
app_secret
:
'
YOUR_APP_SECRET'
}
```
```
...
...
doc/operations/metrics/alerts.md
View file @
0881c145
...
@@ -70,7 +70,8 @@ receivers:
...
@@ -70,7 +70,8 @@ receivers:
bearer_token
:
9e1cbfcd546896a9ea8be557caf13a76
bearer_token
:
9e1cbfcd546896a9ea8be557caf13a76
send_resolved
:
true
send_resolved
:
true
url
:
http://192.168.178.31:3001/root/manual_prometheus/prometheus/alerts/notify.json
url
:
http://192.168.178.31:3001/root/manual_prometheus/prometheus/alerts/notify.json
...
# Rest of configuration omitted
# ...
```
```
For GitLab to associate your alerts with an
[
environment
](
../../ci/environments/index.md
)
,
For GitLab to associate your alerts with an
[
environment
](
../../ci/environments/index.md
)
,
...
...
doc/operations/metrics/dashboards/panel_types.md
View file @
0881c145
doc/topics/autodevops/index.md
View file @
0881c145
doc/user/clusters/agent/index.md
View file @
0881c145
...
@@ -125,7 +125,7 @@ the Agent in subsequent steps. You can create an Agent record either:
...
@@ -125,7 +125,7 @@ the Agent in subsequent steps. You can create an Agent record either:
-
Through GraphQL:
**(PREMIUM ONLY)**
-
Through GraphQL:
**(PREMIUM ONLY)**
```
json
```
graphql
mutation
createAgent
{
mutation
createAgent
{
createClusterAgent
(
input
:
{
projectPath
:
"path-to/your-awesome-project"
,
name
:
"<agent-name>"
})
{
createClusterAgent
(
input
:
{
projectPath
:
"path-to/your-awesome-project"
,
name
:
"<agent-name>"
})
{
clusterAgent
{
clusterAgent
{
...
...
doc/user/project/clusters/add_remove_clusters.md
View file @
0881c145
...
@@ -269,7 +269,7 @@ To add a Kubernetes cluster to your project, group, or instance:
...
@@ -269,7 +269,7 @@ To add a Kubernetes cluster to your project, group, or instance:
Copy the `<authentication_token>` value from the output:
Copy the `<authentication_token>` value from the output:
```
yaml
```
plaintext
Name: gitlab-token-b5zv4
Name: gitlab-token-b5zv4
Namespace: kube-system
Namespace: kube-system
Labels: <none>
Labels: <none>
...
...
doc/user/project/clusters/serverless/aws.md
View file @
0881c145
...
@@ -222,7 +222,8 @@ the environment of the deployed function:
...
@@ -222,7 +222,8 @@ the environment of the deployed function:
```
yaml
```
yaml
provider
:
provider
:
...
# Other configuration omitted
# ...
environment
:
environment
:
A_VARIABLE
:
${env:A_VARIABLE}
A_VARIABLE
:
${env:A_VARIABLE}
```
```
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment