diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-04 12:09:16 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-04 12:09:16 +0300 |
commit | 7ea6cb331a8d50e201ef5da34dcfd62b93760c5b (patch) | |
tree | 1a4145ef8500214150cd6b6c004d737016b1bdc0 /doc/user | |
parent | e3bdfa1a13d7e6c92716324c78b5b20c07eeb7c6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/analytics/value_stream_analytics.md | 2 | ||||
-rw-r--r-- | doc/user/application_security/container_scanning/index.md | 4 | ||||
-rw-r--r-- | doc/user/application_security/dependency_scanning/index.md | 4 | ||||
-rw-r--r-- | doc/user/clusters/applications.md | 8 | ||||
-rw-r--r-- | doc/user/clusters/crossplane.md | 4 | ||||
-rw-r--r-- | doc/user/group/saml_sso/scim_setup.md | 2 | ||||
-rw-r--r-- | doc/user/markdown.md | 2 | ||||
-rw-r--r-- | doc/user/packages/npm_registry/index.md | 8 | ||||
-rw-r--r-- | doc/user/profile/account/two_factor_authentication.md | 2 | ||||
-rw-r--r-- | doc/user/profile/index.md | 2 | ||||
-rw-r--r-- | doc/user/project/import/github.md | 2 | ||||
-rw-r--r-- | doc/user/project/integrations/microsoft_teams.md | 2 | ||||
-rw-r--r-- | doc/user/project/integrations/prometheus.md | 2 | ||||
-rw-r--r-- | doc/user/project/issues/crosslinking_issues.md | 2 | ||||
-rw-r--r-- | doc/user/project/pages/custom_domains_ssl_tls_certification/dns_concepts.md | 4 | ||||
-rw-r--r-- | doc/user/project/repository/web_editor.md | 2 | ||||
-rw-r--r-- | doc/user/search/advanced_global_search.md | 6 |
17 files changed, 29 insertions, 29 deletions
diff --git a/doc/user/analytics/value_stream_analytics.md b/doc/user/analytics/value_stream_analytics.md index f54cf84af5d..22af788b6f5 100644 --- a/doc/user/analytics/value_stream_analytics.md +++ b/doc/user/analytics/value_stream_analytics.md @@ -306,6 +306,6 @@ For Value Stream Analytics functionality introduced in GitLab 12.3 and later: Learn more about Value Stream Analytics in the following resources: -- [Value Stream Analytics feature page](https://about.gitlab.com/stages-devops-lifecycle/cycle-analytics/). +- [Value Stream Analytics feature page](https://about.gitlab.com/stages-devops-lifecycle/value-stream-analytics/). - [Value Stream Analytics feature preview](https://about.gitlab.com/blog/2016/09/16/feature-preview-introducing-cycle-analytics/). - [Value Stream Analytics feature highlight](https://about.gitlab.com/blog/2016/09/21/cycle-analytics-feature-highlight/). diff --git a/doc/user/application_security/container_scanning/index.md b/doc/user/application_security/container_scanning/index.md index a368fa4ae02..801cacac958 100644 --- a/doc/user/application_security/container_scanning/index.md +++ b/doc/user/application_security/container_scanning/index.md @@ -10,7 +10,7 @@ type: reference, howto If you are using [GitLab CI/CD](../../../ci/README.md), you can check your Docker images (or more precisely the containers) for known vulnerabilities by using -[Clair](https://github.com/coreos/clair) and [klar](https://github.com/optiopay/klar), +[Clair](https://github.com/quay/clair) and [klar](https://github.com/optiopay/klar), two open source tools for Vulnerability Static Analysis for containers. You can take advantage of Container Scanning by either [including the CI job](#configuration) in @@ -263,7 +263,7 @@ against a Docker container without needing to run it within the context of a CI image directly, follow these steps: 1. Run [Docker Desktop](https://www.docker.com/products/docker-desktop) or [Docker Machine](https://github.com/docker/machine). -1. Run the latest [prefilled vulnerabilities database](https://cloud.docker.com/repository/docker/arminc/clair-db) Docker image: +1. Run the latest [prefilled vulnerabilities database](https://hub.docker.com/repository/docker/arminc/clair-db) Docker image: ```shell docker run -p 5432:5432 -d --name clair-db arminc/clair-db:latest diff --git a/doc/user/application_security/dependency_scanning/index.md b/doc/user/application_security/dependency_scanning/index.md index 6ef3fa18b35..352fdb64d07 100644 --- a/doc/user/application_security/dependency_scanning/index.md +++ b/doc/user/application_security/dependency_scanning/index.md @@ -58,11 +58,11 @@ The following languages and dependency managers are supported. |----------------------------- | --------- | ------------ | | Java ([Gradle](https://gradle.org/)) | yes | [gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium) | | Java ([Maven](https://maven.apache.org/)) | yes | [gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium) | -| JavaScript ([npm](https://www.npmjs.com/), [yarn](https://yarnpkg.com/en/)) | yes | [gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium), [Retire.js](https://retirejs.github.io/retire.js/) | +| JavaScript ([npm](https://www.npmjs.com/), [yarn](https://classic.yarnpkg.com/en/)) | yes | [gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium), [Retire.js](https://retirejs.github.io/retire.js/) | | PHP ([Composer](https://getcomposer.org/)) | yes | [gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium) | | Python ([pip](https://pip.pypa.io/en/stable/)) | yes | [gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium) | | Python ([Pipfile](https://pipenv.kennethreitz.org/en/latest/basics/)) | not currently ([issue](https://gitlab.com/gitlab-org/gitlab/issues/11756 "Pipfile.lock support for Dependency Scanning"))| not available | -| Python ([poetry](https://poetry.eustace.io/)) | not currently ([issue](https://gitlab.com/gitlab-org/gitlab/issues/7006 "Support Poetry in Dependency Scanning")) | not available | +| Python ([poetry](http://python-poetry.org/)) | not currently ([issue](https://gitlab.com/gitlab-org/gitlab/issues/7006 "Support Poetry in Dependency Scanning")) | not available | | Ruby ([gem](https://rubygems.org/)) | yes | [gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium), [bundler-audit](https://github.com/rubysec/bundler-audit) | | Scala ([sbt](https://www.scala-sbt.org/)) | yes | [gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium) | | Go ([Go Modules](https://github.com/golang/go/wiki/Modules)) | yes ([alpha](https://gitlab.com/gitlab-org/gitlab/issues/7132)) | [gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium) | diff --git a/doc/user/clusters/applications.md b/doc/user/clusters/applications.md index 866b1206a98..0aff09910d2 100644 --- a/doc/user/clusters/applications.md +++ b/doc/user/clusters/applications.md @@ -427,7 +427,7 @@ file. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/34702) in GitLab 12.5 for project-level clusters. -[Crossplane](https://crossplane.io/docs) is a multi-cloud control plane useful for +[Crossplane](https://crossplane.github.io/docs/v0.9/) is a multi-cloud control plane useful for managing applications and infrastructure across multiple clouds. It extends the Kubernetes API using: @@ -452,14 +452,14 @@ For information on configuring Crossplane installed on the cluster, see NOTE: **Note:** [`alpha/crossplane`](https://charts.crossplane.io/alpha/) chart v0.4.1 is used to install Crossplane using the -[`values.yaml`](https://github.com/crossplaneio/crossplane/blob/master/cluster/charts/crossplane/values.yaml.tmpl) +[`values.yaml`](https://github.com/crossplane/crossplane/blob/master/cluster/charts/crossplane/values.yaml.tmpl) file. ### Elastic Stack > Introduced in GitLab 12.7 for project- and group-level clusters. -[Elastic Stack](https://www.elastic.co/products/elastic-stack) is a complete end-to-end +[Elastic Stack](https://www.elastic.co/elastic-stack) is a complete end-to-end log analysis solution which helps in deep searching, analyzing and visualizing the logs generated from different machines. @@ -829,7 +829,7 @@ agent: > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/9982) in GitLab 12.9. -[Hashicorp Vault](https://vaultproject.io/) is a secrets management solution which +[Hashicorp Vault](https://www.vaultproject.io/) is a secrets management solution which can be used to safely manage and store passwords, credentials, certificates and more. A Vault installation could be leveraged to provide a single secure data store for credentials used in your applications, GitLab CI/CD jobs, and more. It could also serve as a way of diff --git a/doc/user/clusters/crossplane.md b/doc/user/clusters/crossplane.md index c92337ee5f0..4e2ae87ecb9 100644 --- a/doc/user/clusters/crossplane.md +++ b/doc/user/clusters/crossplane.md @@ -71,14 +71,14 @@ export REGION=us-central1 # the GCP region where the GKE cluster is provisioned. ## Configure Crossplane with a cloud provider -See [Configure Your Cloud Provider Account](https://crossplane.io/docs/v0.4/cloud-providers.html) +See [Configure Your Cloud Provider Account](https://crossplane.github.io/docs/v0.4/cloud-providers.html) to configure the installed cloud provider stack with a user account. Note that the Secret and the Provider resource referencing the Secret needs to be applied to the `gitlab-managed-apps` namespace in the guide. Make sure you change that while following the process. -[Configure Providers](https://crossplane.io/docs/v0.4/cloud-providers.html) +[Configure Providers](https://crossplane.github.io/docs/v0.4/cloud-providers.html) ## Configure Managed Service Access diff --git a/doc/user/group/saml_sso/scim_setup.md b/doc/user/group/saml_sso/scim_setup.md index aea7f1e93e7..e38cc73d035 100644 --- a/doc/user/group/saml_sso/scim_setup.md +++ b/doc/user/group/saml_sso/scim_setup.md @@ -47,7 +47,7 @@ The SAML application that was created during [Single sign-on](index.md) setup no ![Name identifier value mapping](img/scim_name_identifier_mapping.png) 1. Set up automatic provisioning and administrative credentials by following the - [Provisioning users and groups to applications that support SCIM](https://docs.microsoft.com/en-us/azure/active-directory/manage-apps/use-scim-to-provision-users-and-groups#provisioning-users-and-groups-to-applications-that-support-scim) section in Azure's SCIM setup documentation. + [Provisioning users and groups to applications that support SCIM](https://docs.microsoft.com/en-us/azure/active-directory/app-provisioning/use-scim-to-provision-users-and-groups#provisioning-users-and-groups-to-applications-that-support-scim) section in Azure's SCIM setup documentation. During this configuration, note the following: diff --git a/doc/user/markdown.md b/doc/user/markdown.md index 866293302cf..d297a704925 100644 --- a/doc/user/markdown.md +++ b/doc/user/markdown.md @@ -14,7 +14,7 @@ NOTE: **Note:** We encourage you to view this document as [rendered by GitLab it GitLab uses "GitLab Flavored Markdown" (GFM). It extends the [CommonMark specification](https://spec.commonmark.org/current/) (which is based on standard Markdown) in several ways to add additional useful functionality. -It was inspired by [GitHub Flavored Markdown](https://help.github.com/en/articles/basic-writing-and-formatting-syntax). +It was inspired by [GitHub Flavored Markdown](https://help.github.com/en/github/writing-on-github/basic-writing-and-formatting-syntax). You can use GFM in the following areas: diff --git a/doc/user/packages/npm_registry/index.md b/doc/user/packages/npm_registry/index.md index 373e399d56f..7b97933aa89 100644 --- a/doc/user/packages/npm_registry/index.md +++ b/doc/user/packages/npm_registry/index.md @@ -56,7 +56,7 @@ You should see the NPM version printed in the output: ### Installing Yarn You may want to install and use Yarn as an alternative to NPM. Follow the -instructions at [yarnpkg.com](https://yarnpkg.com/en/docs/install) to install on +instructions at [yarnpkg.com](https://classic.yarnpkg.com/en/docs/install) to install on your development environment. Once installed, you can verify that Yarn is available with the following command: @@ -133,7 +133,7 @@ domain name. You should now be able to download and upload NPM packages to your project. NOTE: **Note:** -If you encounter an error message with [Yarn](https://yarnpkg.com/en/), see the +If you encounter an error message with [Yarn](https://classic.yarnpkg.com/en/), see the [troubleshooting section](#troubleshooting). ### Using variables to avoid hard-coding auth token values @@ -307,7 +307,7 @@ deploy: ### Error running yarn with NPM registry -If you are using [yarn](https://yarnpkg.com/en/) with the NPM registry, you may get +If you are using [yarn](https://classic.yarnpkg.com/en/) with the NPM registry, you may get an error message like: ```shell @@ -319,7 +319,7 @@ warning XXX: No license field [2/4] 🚚 Fetching packages... error An unexpected error occurred: "https://gitlab.com/api/v4/projects/XXX/packages/npm/XXX/XXX/-/XXX/XXX-X.X.X.tgz: Request failed \"404 Not Found\"". info If you think this is a bug, please open a bug report with the information provided in "/Users/XXX/gitlab-migration/module-util/yarn-error.log". -info Visit https://yarnpkg.com/en/docs/cli/install for documentation about this command +info Visit https://classic.yarnpkg.com/en/docs/cli/install for documentation about this command ``` In this case, try adding this to your `.npmrc` file (and replace `<your_token>` diff --git a/doc/user/profile/account/two_factor_authentication.md b/doc/user/profile/account/two_factor_authentication.md index b778a543935..ac0835911d2 100644 --- a/doc/user/profile/account/two_factor_authentication.md +++ b/doc/user/profile/account/two_factor_authentication.md @@ -65,7 +65,7 @@ in a safe place. ### Enable 2FA via U2F device -GitLab officially only supports [YubiKey](https://www.yubico.com/products/yubikey-hardware/) +GitLab officially only supports [YubiKey](https://www.yubico.com/products/) U2F devices, but users have successfully used [SoloKeys](https://solokeys.com/). The U2F workflow is [supported by](https://caniuse.com/#search=U2F) the diff --git a/doc/user/profile/index.md b/doc/user/profile/index.md index 69dd86ded02..66ee19437ae 100644 --- a/doc/user/profile/index.md +++ b/doc/user/profile/index.md @@ -224,7 +224,7 @@ and expires after "Application settings -> Session duration (minutes)"/`session_ When signing in to the main GitLab application, you can also check the "Remember me" option which sets the `remember_user_token` -cookie (via [`devise`](https://github.com/plataformatec/devise)). +cookie (via [`devise`](https://github.com/heartcombo/devise)). `remember_user_token` expires after `config/initializers/devise.rb` -> `config.remember_for` (defaults to 2 weeks). diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md index ede2369dd3e..db8d33b58da 100644 --- a/doc/user/project/import/github.md +++ b/doc/user/project/import/github.md @@ -74,7 +74,7 @@ Before you begin, ensure that any GitHub users who you want to map to GitLab use - A GitLab account that has logged in using the GitHub icon \- or - -- A GitLab account with an email address that matches the [public email address](https://help.github.com/en/articles/setting-your-commit-email-address) of the GitHub user +- A GitLab account with an email address that matches the [public email address](https://help.github.com/en/github/setting-up-and-managing-your-github-user-account/setting-your-commit-email-address) of the GitHub user User-matching attempts occur in that order, and if a user is not identified either way, the activity is associated with the user account that is performing the import. diff --git a/doc/user/project/integrations/microsoft_teams.md b/doc/user/project/integrations/microsoft_teams.md index 6d37646d75b..611ae1a01af 100644 --- a/doc/user/project/integrations/microsoft_teams.md +++ b/doc/user/project/integrations/microsoft_teams.md @@ -3,7 +3,7 @@ ## On Microsoft Teams To enable Microsoft Teams integration you must create an incoming webhook integration on Microsoft -Teams by following the steps described in [Sending messages to Connectors and Webhooks](https://docs.microsoft.com/microsoftteams/platform/webhooks-and-connectors/how-to/connectors-using). +Teams by following the steps described in [Sending messages to Connectors and Webhooks](https://docs.microsoft.com/en-us/microsoftteams/platform/webhooks-and-connectors/how-to/connectors-using). ## On GitLab diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md index f8156a484ac..2b1608ad60c 100644 --- a/doc/user/project/integrations/prometheus.md +++ b/doc/user/project/integrations/prometheus.md @@ -169,7 +169,7 @@ Variables for Prometheus queries must be lowercase. There are 2 methods to specify a variable in a query or dashboard: -1. Variables can be specified using the [Liquid template format](https://help.shopify.com/en/themes/liquid/basics), for example `{{ci_environment_slug}}` ([added](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20793) in GitLab 12.6). +1. Variables can be specified using the [Liquid template format](https://shopify.dev/docs/liquid/reference/basics), for example `{{ci_environment_slug}}` ([added](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20793) in GitLab 12.6). 1. You can also enclose it in quotation marks with curly braces with a leading percent, for example `"%{ci_environment_slug}"`. This method is deprecated though and support will be [removed in the next major release](https://gitlab.com/gitlab-org/gitlab/issues/37990). #### Editing additional metrics from the dashboard diff --git a/doc/user/project/issues/crosslinking_issues.md b/doc/user/project/issues/crosslinking_issues.md index 7da59e259de..e774fd4480b 100644 --- a/doc/user/project/issues/crosslinking_issues.md +++ b/doc/user/project/issues/crosslinking_issues.md @@ -26,7 +26,7 @@ git commit -m "this is my commit message. Related to https://gitlab.com/<usernam Of course, you can replace `gitlab.com` with the URL of your own GitLab instance. NOTE: **Note:** Linking your first commit to your issue is going to be relevant -for tracking your process with [GitLab Cycle Analytics](https://about.gitlab.com/stages-devops-lifecycle/cycle-analytics/). +for tracking your process with [GitLab Cycle Analytics](https://about.gitlab.com/stages-devops-lifecycle/value-stream-analytics/). It will measure the time taken for planning the implementation of that issue, which is the time between creating an issue and making the first commit. diff --git a/doc/user/project/pages/custom_domains_ssl_tls_certification/dns_concepts.md b/doc/user/project/pages/custom_domains_ssl_tls_certification/dns_concepts.md index 6b02a941060..172f5d4377f 100644 --- a/doc/user/project/pages/custom_domains_ssl_tls_certification/dns_concepts.md +++ b/doc/user/project/pages/custom_domains_ssl_tls_certification/dns_concepts.md @@ -28,13 +28,13 @@ To help you out, we've gathered some instructions on how to do that for the most popular hosting services: - [Amazon](https://docs.aws.amazon.com/AmazonS3/latest/dev/website-hosting-custom-domain-walkthrough.html) -- [Bluehost](https://my.bluehost.com/cgi/help/559) +- [Bluehost](https://www.bluehost.com/help/article/dns-management-add-edit-or-delete-dns-entries) - [CloudFlare](https://support.cloudflare.com/hc/en-us/articles/201720164-Creating-a-Cloudflare-account-and-adding-a-website) - [cPanel](https://documentation.cpanel.net/display/84Docs/Edit+DNS+Zone) - [DreamHost](https://help.dreamhost.com/hc/en-us/articles/215414867-How-do-I-add-custom-DNS-records-) - [Go Daddy](https://www.godaddy.com/help/add-an-a-record-19238) - [Hostgator](https://www.hostgator.com/help/article/changing-dns-records) -- [Inmotion hosting](https://my.bluehost.com/cgi/help/559) +- [Inmotion hosting](https://www.bluehost.com/help/article/dns-management-add-edit-or-delete-dns-entries) - [Media Temple](https://mediatemple.net/community/products/dv/204403794/how-can-i-change-the-dns-records-for-my-domain) - [Microsoft](https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-2000-server/bb727018(v=technet.10)) diff --git a/doc/user/project/repository/web_editor.md b/doc/user/project/repository/web_editor.md index 3a6fef0bc51..28941e755c0 100644 --- a/doc/user/project/repository/web_editor.md +++ b/doc/user/project/repository/web_editor.md @@ -91,7 +91,7 @@ There are multiple ways to create a branch from GitLab's web interface. ### Create a new branch from an issue -> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/2808) in GitLab 8.6. +> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/2808) in GitLab 8.6. If your development workflow dictates to have an issue for every merge request, you can quickly create a branch directly from the issue to speed the process up. diff --git a/doc/user/search/advanced_global_search.md b/doc/user/search/advanced_global_search.md index 3dd307d4846..e121f7883be 100644 --- a/doc/user/search/advanced_global_search.md +++ b/doc/user/search/advanced_global_search.md @@ -63,13 +63,13 @@ then the "Code" tab in the search result page will be served by the regular search even if Elasticsearch is enabled. [ee-1305]: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1305 -[aws-elastic]: http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-gsg.html +[aws-elastic]: https://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-gsg.html [aws-iam]: http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html [aws-instance-profile]: http://docs.aws.amazon.com/codedeploy/latest/userguide/getting-started-create-iam-instance-profile.html#getting-started-create-iam-instance-profile-cli [ee-109]: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109 "Elasticsearch Merge Request" -[elasticsearch]: https://www.elastic.co/products/elasticsearch "Elasticsearch website" +[elasticsearch]: https://www.elastic.co/elasticsearch "Elasticsearch website" [install]: https://www.elastic.co/guide/en/elasticsearch/reference/current/_installation.html "Elasticsearch installation documentation" [pkg]: https://about.gitlab.com/downloads/ "Download Omnibus GitLab" [elastic-settings]: https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-configuration.html#settings "Elasticsearch configuration settings" [ee]: https://about.gitlab.com/pricing/ -[es]: https://www.elastic.co/products/elasticsearch +[es]: https://www.elastic.co/elasticsearch |