Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-07 06:06:16 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-07 06:06:16 +0300
commiteb0d9e20c5a81b0a556308ae3fc8015fcc3c9621 (patch)
tree1ef7347e275986d8d7621cc21d64f3eec1aa7a3a /doc
parentee6b185429b62857a5e490526095a7699e8539f3 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r--doc/development/kubernetes.md12
-rw-r--r--doc/raketasks/cleanup.md2
-rw-r--r--doc/topics/autodevops/quick_start_guide.md2
3 files changed, 8 insertions, 8 deletions
diff --git a/doc/development/kubernetes.md b/doc/development/kubernetes.md
index 4a554912e05..a0dd97f2a1c 100644
--- a/doc/development/kubernetes.md
+++ b/doc/development/kubernetes.md
@@ -94,12 +94,12 @@ the provisioning actions. The following resources must be present:
- A service account with permissions to assume the provisioning
role in the `Customer` account above.
- Credentials for this service account configured in GitLab via
- the `kubernetes` section of `gitlab.yml`
+ the `kubernetes` section of `gitlab.yml`.
The process for creating a cluster is as follows:
-1. Using the :provision_role_external_id, GitLab assumes the role provided
- by :provision_role_arn and stores a set of temporary credentials on the
+1. Using the `:provision_role_external_id`, GitLab assumes the role provided
+ by `:provision_role_arn` and stores a set of temporary credentials on the
provider record. By default these credentials are valid for one hour.
1. A CloudFormation stack is created, based on the
[`AWS CloudFormation EKS template`](https://gitlab.com/gitlab-org/gitlab/blob/master/vendor/aws/cloudformation/eks_cluster.yaml).
@@ -114,9 +114,9 @@ The process for creating a cluster is as follows:
1. Credentials that are no longer required are removed. This deletes the following
attributes:
-- `access_key_id`
-- `secret_access_key`
-- `session_token`
+ - `access_key_id`
+ - `secret_access_key`
+ - `session_token`
## Security
diff --git a/doc/raketasks/cleanup.md b/doc/raketasks/cleanup.md
index 67bf7cbd828..937f15554b4 100644
--- a/doc/raketasks/cleanup.md
+++ b/doc/raketasks/cleanup.md
@@ -88,7 +88,7 @@ gitlab-rake gitlab:cleanup:orphan_job_artifact_files DRY_RUN=false
You can also limit the number of files to delete with `LIMIT`:
```shell
-gitlab-rake gitlab:cleanup:orphan_job_artifact_files LIMIT=100`
+gitlab-rake gitlab:cleanup:orphan_job_artifact_files LIMIT=100
```
This will only delete up to 100 files from disk. You can use this to
diff --git a/doc/topics/autodevops/quick_start_guide.md b/doc/topics/autodevops/quick_start_guide.md
index 8ec3d5fe36e..ce3a3dd5ca6 100644
--- a/doc/topics/autodevops/quick_start_guide.md
+++ b/doc/topics/autodevops/quick_start_guide.md
@@ -25,7 +25,7 @@ Google account (for example, one that you use to access Gmail, Drive, etc.) or c
TIP: **Tip:**
Every new Google Cloud Platform (GCP) account receives [$300 in credit](https://console.cloud.google.com/freetrial),
and in partnership with Google, GitLab is able to offer an additional $200 for new GCP accounts to get started with GitLab's
-Google Kubernetes Engine Integration. All you have to do is [follow this link](https://cloud.google.com/partners/partnercredit/?PCN=a0n60000006Vpz4AAC) and apply for credit.
+Google Kubernetes Engine Integration. All you have to do is [follow this link](https://cloud.google.com/partners/partnercredit/?pcn_code=0014M00001h35gDQAQ#contact-form) and apply for credit.
## Creating a new project from a template