diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-02 12:06:04 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-02 12:06:04 +0000 |
commit | 81c6c53d6cd5ffde1c070d987dc2985f662cb301 (patch) | |
tree | 97ddbeb02373e8134edaa3e045f74d41d66cd500 /doc/user/project | |
parent | f7e0be9bbe1173b0de18a52a21b49d19349f40b7 (diff) | |
download | gitlab-ce-81c6c53d6cd5ffde1c070d987dc2985f662cb301.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project')
8 files changed, 32 insertions, 32 deletions
diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md index 49878978154..9d61cba8e7e 100644 --- a/doc/user/project/clusters/index.md +++ b/doc/user/project/clusters/index.md @@ -61,7 +61,7 @@ GitLab makes it easy to view the logs of running pods in connected Kubernetes cl ### Kubernetes monitoring Automatically detect and monitor Kubernetes metrics. Automatic monitoring of -[NGINX ingress](../integrations/prometheus_library/nginx.md) is also supported. +[NGINX Ingress](../integrations/prometheus_library/nginx.md) is also supported. [Read more about Kubernetes monitoring](../integrations/prometheus_library/kubernetes.md) @@ -380,7 +380,7 @@ Specifying a base domain will automatically set `KUBE_INGRESS_BASE_DOMAIN` as an If you are using [Auto DevOps](../../../topics/autodevops/index.md), this domain will be used for the different stages. For example, Auto Review Apps and Auto Deploy. -The domain should have a wildcard DNS configured to the Ingress IP address. After ingress has been installed (see [Installing Applications](#installing-applications)), +The domain should have a wildcard DNS configured to the Ingress IP address. After Ingress has been installed (see [Installing Applications](#installing-applications)), you can either: - Create an `A` record that points to the Ingress IP address with your domain provider. @@ -548,7 +548,7 @@ differentiate the new cluster with the rest. GitLab can install and manage some applications in your project-level cluster. For more information on installing, upgrading, uninstalling, and troubleshooting applications for your project cluster, see -[Gitlab Managed Apps](../../clusters/applications.md). +[GitLab Managed Apps](../../clusters/applications.md). ### Getting the external endpoint @@ -565,7 +565,7 @@ address or a hostname associated with your load balancer. > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/17052) in GitLab 10.6. -After you install [Ingress or Knative](#installing-applications), Gitlab attempts to determine the external endpoint +After you install [Ingress or Knative](#installing-applications), GitLab attempts to determine the external endpoint and it should be available within a few minutes. If the endpoint doesn't appear and your cluster runs on Google Kubernetes Engine: diff --git a/doc/user/project/clusters/runbooks/index.md b/doc/user/project/clusters/runbooks/index.md index 7e5c1b3d4ed..26ce4820174 100644 --- a/doc/user/project/clusters/runbooks/index.md +++ b/doc/user/project/clusters/runbooks/index.md @@ -38,7 +38,7 @@ To create an executable runbook, you will need: The simplest way to get started is to add a cluster using [GitLab's GKE integration](../index.md#add-new-gke-cluster). 1. **Helm Tiller** - Helm is a package manager for Kubernetes and is required to install all the other applications. It is installed in its own pod inside the cluster which - can run the helm CLI in a safe environment. + can run the Helm CLI in a safe environment. 1. **Ingress** - Ingress can provide load balancing, SSL termination, and name-based virtual hosting. It acts as a web proxy for your applications. 1. **JupyterHub** - [JupyterHub](https://jupyterhub.readthedocs.io/) is a multi-user service for managing notebooks across @@ -48,7 +48,7 @@ To create an executable runbook, you will need: ## Nurtch Nurtch is the company behind the [Rubix library](https://github.com/Nurtch/rubix). Rubix is -an open-source python library that makes it easy to perform common DevOps tasks inside Jupyter Notebooks. +an open-source Python library that makes it easy to perform common DevOps tasks inside Jupyter Notebooks. Tasks such as plotting Cloudwatch metrics and rolling your ECS/Kubernetes app are simplified down to a couple of lines of code. See the [Nurtch Documentation](http://docs.nurtch.com/en/latest) for more information. diff --git a/doc/user/project/clusters/serverless/index.md b/doc/user/project/clusters/serverless/index.md index 5d91b01e5b0..9a9857bd5da 100644 --- a/doc/user/project/clusters/serverless/index.md +++ b/doc/user/project/clusters/serverless/index.md @@ -9,12 +9,12 @@ Serverless is currently in [alpha](https://about.gitlab.com/handbook/product/#al Serverless architectures offer Operators and Developers the ability write highly scalable applications without provisioning a single server. -Gitlab supports several ways deploy Serverless applications in both Kubernetes Environments and also major cloud FAAS environments. +GitLab supports several ways deploy Serverless applications in both Kubernetes Environments and also major cloud FAAS environments. Currently we support: - [Knative](#knative): Build Knative applications with Knative and gitlabktl on GKE -- [AWS Lambda](aws.md): Create serverless applications via the Serverless Framework and gitlab-ci +- [AWS Lambda](aws.md): Create serverless applications via the Serverless Framework and GitLab CI ## Knative @@ -31,7 +31,7 @@ With GitLab Serverless, you can deploy both functions-as-a-service (FaaS) and se ## Prerequisites -To run Knative on Gitlab, you will need: +To run Knative on GitLab, you will need: 1. **Existing GitLab project:** You will need a GitLab project to associate all resources. The simplest way to get started: @@ -82,10 +82,10 @@ The minimum recommended cluster size to run Knative is 3-nodes, 6 vCPUs, and 22. For clusters created on GKE, see [GKE Cluster Access](https://cloud.google.com/kubernetes-engine/docs/how-to/cluster-access-for-kubectl), for other platforms [Install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/). -1. The ingress is now available at this address and will route incoming requests to the proper service based on the DNS +1. The Ingress is now available at this address and will route incoming requests to the proper service based on the DNS name in the request. To support this, a wildcard DNS A record should be created for the desired domain name. For example, if your Knative base domain is `knative.info` then you need to create an A record or CNAME record with domain `*.knative.info` - pointing the ip address or hostname of the ingress. + pointing the ip address or hostname of the Ingress. ![dns entry](img/dns-entry.png) diff --git a/doc/user/project/operations/feature_flags.md b/doc/user/project/operations/feature_flags.md index 97b3ca0067e..08df92959c3 100644 --- a/doc/user/project/operations/feature_flags.md +++ b/doc/user/project/operations/feature_flags.md @@ -174,9 +174,9 @@ Official clients: Community contributed clients: -- [stiano/unleash-client-dotnet](https://github.com/stiano/unleash-client-dotnet) (.Net Core) -- [onybo/unleash-client-core](https://github.com/onybo/unleash-client-core) (.Net Core) -- [aes/unleash-client-python](https://github.com/aes/unleash-client-python) (Python 3) +- [Unleash FeatureToggle Client for .Net](https://github.com/stiano/unleash-client-dotnet) +- [Unofficial .Net Core Unleash client](https://github.com/onybo/unleash-client-core) +- [Unleash client for Python 3](https://github.com/aes/unleash-client-python) ### Golang application example diff --git a/doc/user/project/pages/custom_domains_ssl_tls_certification/index.md b/doc/user/project/pages/custom_domains_ssl_tls_certification/index.md index 849cd1a8ee4..d36f81f375c 100644 --- a/doc/user/project/pages/custom_domains_ssl_tls_certification/index.md +++ b/doc/user/project/pages/custom_domains_ssl_tls_certification/index.md @@ -67,10 +67,10 @@ Root domains (`example.com`) require: - A [DNS A record](dns_concepts.md#a-record) pointing your domain to the Pages server. - A [TXT record](dns_concepts.md#txt-record) to verify your domain's ownership. -| From | DNS Record | To | -| ---- | ---------- | -- | -| example.com | A | 35.185.44.232 | -| _gitlab-pages-verification-code.example.com | TXT | gitlab-pages-verification-code=00112233445566778899aabbccddeeff | +| From | DNS Record | To | +| --------------------------------------------- | ---------- | --------------- | +| `example.com` | A | `35.185.44.232` | +| `_gitlab-pages-verification-code.example.com` | TXT | `gitlab-pages-verification-code=00112233445566778899aabbccddeeff` | For projects on GitLab.com, this IP is `35.185.44.232`. For projects living in other GitLab instances (CE or EE), please contact @@ -95,10 +95,10 @@ Subdomains (`subdomain.example.com`) require: - A DNS [CNAME record](dns_concepts.md#cname-record) record pointing your subdomain to the Pages server. - A DNS [TXT record](dns_concepts.md#txt-record) to verify your domain's ownership. -| From | DNS Record | To | -| ---- | ---------- | -- | -| subdomain.example.com | CNAME | namespace.gitlab.io | -| _gitlab-pages-verification-code.subdomain.example.com | TXT | gitlab-pages-verification-code=00112233445566778899aabbccddeeff | +| From | DNS Record | To | +| ------------------------------------------------------- | ---------- | --------------------- | +| `subdomain.example.com` | CNAME | `namespace.gitlab.io` | +| `_gitlab-pages-verification-code.subdomain.example.com` | TXT | `gitlab-pages-verification-code=00112233445566778899aabbccddeeff` | Note that, whether it's a user or a project website, the `CNAME` should point to your Pages domain (`namespace.gitlab.io`), @@ -117,13 +117,13 @@ They require: - A DNS CNAME record for the subdomain. - A DNS TXT record for each. -| From | DNS Record | To | -| ---- | ---------- | -- | -| example.com | A | 35.185.44.232 | -| _gitlab-pages-verification-code.example.com | TXT | gitlab-pages-verification-code=00112233445566778899aabbccddeeff | -|---+---| -| www.example.com | CNAME | namespace.gitlab.io | -| _gitlab-pages-verification-code.www.example.com | TXT | gitlab-pages-verification-code=00112233445566778899aabbccddeeff | +| From | DNS Record | To | +| ------------------------------------------------- | ---------- | ---------------------- | +| `example.com` | A | `35.185.44.232` | +| `_gitlab-pages-verification-code.example.com` | TXT | `gitlab-pages-verification-code=00112233445566778899aabbccddeeff` | +|--------------------------------------------+--------------------------------------------| +| `www.example.com` | CNAME | `namespace.gitlab.io` | +| `_gitlab-pages-verification-code.www.example.com` | TXT | `gitlab-pages-verification-code=00112233445566778899aabbccddeeff` | If you're using CloudFlare, check [Redirecting `www.domain.com` to `domain.com` with Cloudflare](#redirecting-wwwdomaincom-to-domaincom-with-cloudflare). diff --git a/doc/user/project/pages/custom_domains_ssl_tls_certification/ssl_tls_concepts.md b/doc/user/project/pages/custom_domains_ssl_tls_certification/ssl_tls_concepts.md index ee0550bfca2..b31ae053a81 100644 --- a/doc/user/project/pages/custom_domains_ssl_tls_certification/ssl_tls_concepts.md +++ b/doc/user/project/pages/custom_domains_ssl_tls_certification/ssl_tls_concepts.md @@ -54,7 +54,7 @@ reiterating the importance of HTTPS. ## Issuing Certificates GitLab Pages accepts certificates provided in the [PEM](https://support.quovadisglobal.com/kb/a37/what-is-pem-format.aspx) format, issued by -[Certificate Authorities (CAs)](https://en.wikipedia.org/wiki/Certificate_authority) or as +[Certificate Authorities](https://en.wikipedia.org/wiki/Certificate_authority) or as [self-signed certificates](https://en.wikipedia.org/wiki/Self-signed_certificate). Note that [self-signed certificates are typically not used](https://securingtomorrow.mcafee.com/other-blogs/mcafee-labs/self-signed-certificates-secure-so-why-ban/) for public websites for security reasons and to ensure that browsers trust your site's certificate. diff --git a/doc/user/project/pages/getting_started_part_four.md b/doc/user/project/pages/getting_started_part_four.md index 80fa64b162d..da472307650 100644 --- a/doc/user/project/pages/getting_started_part_four.md +++ b/doc/user/project/pages/getting_started_part_four.md @@ -390,5 +390,5 @@ to understand how to go even further on your scripts. in parallel, or build a custom pipeline](https://about.gitlab.com/2016/07/29/the-basics-of-gitlab-ci/) - On this blog post, we go through the process of [pulling specific directories from different projects](https://about.gitlab.com/2016/12/07/building-a-new-gitlab-docs-site-with-nanoc-gitlab-ci-and-gitlab-pages/) - to deploy this website you're looking at, docs.gitlab.com. + to deploy this website you're looking at, <https://docs.gitlab.com>. - On this blog post, we teach you [how to use GitLab Pages to produce a code coverage report](https://about.gitlab.com/2016/11/03/publish-code-coverage-report-with-gitlab-pages/). diff --git a/doc/user/project/pipelines/settings.md b/doc/user/project/pipelines/settings.md index 67051b801f0..a901da978f0 100644 --- a/doc/user/project/pipelines/settings.md +++ b/doc/user/project/pipelines/settings.md @@ -152,7 +152,7 @@ If **Public pipelines** is disabled: > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/9362) in GitLab 9.1. If you want to auto-cancel all pending non-HEAD pipelines on branch, when -new pipeline will be created (after your git push or manually from UI), +new pipeline will be created (after your Git push or manually from UI), check **Auto-cancel pending pipelines** checkbox and save the changes. ## Pipeline Badges |