Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
24df596a07
commit
c5d41b84ce
6 changed files with 21 additions and 7 deletions
|
@ -1 +1 @@
|
||||||
14.1.1
|
14.2.2
|
||||||
|
|
|
@ -73,7 +73,7 @@ choose one of these templates:
|
||||||
- [Django (`Django.gitlab-ci.yml`)](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Django.gitlab-ci.yml)
|
- [Django (`Django.gitlab-ci.yml`)](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Django.gitlab-ci.yml)
|
||||||
- [Docker (`Docker.gitlab-ci.yml`)](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Docker.gitlab-ci.yml)
|
- [Docker (`Docker.gitlab-ci.yml`)](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Docker.gitlab-ci.yml)
|
||||||
- [dotNET (`dotNET.gitlab-ci.yml`)](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/dotNET.gitlab-ci.yml)
|
- [dotNET (`dotNET.gitlab-ci.yml`)](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/dotNET.gitlab-ci.yml)
|
||||||
- [dotNET Core (`dotNET-Core.yml`)](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/dotNET-Core.yml)
|
- [dotNET Core (`dotNET-Core.gitlab-ci.yml`)](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/dotNET-Core.gitlab-ci.yml)
|
||||||
- [Elixir (`Elixir.gitlab-ci.yml`)](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Elixir.gitlab-ci.yml)
|
- [Elixir (`Elixir.gitlab-ci.yml`)](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Elixir.gitlab-ci.yml)
|
||||||
- [Flutter (`Flutter.gitlab-ci.yml`)](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Flutter.gitlab-ci.yml)
|
- [Flutter (`Flutter.gitlab-ci.yml`)](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Flutter.gitlab-ci.yml)
|
||||||
- [goLang (`Go.gitlab-ci.yml`)](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Go.gitlab-ci.yml)
|
- [goLang (`Go.gitlab-ci.yml`)](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Go.gitlab-ci.yml)
|
||||||
|
|
|
@ -61,7 +61,7 @@ GitLab CI/CD uses a number of concepts to describe and run your build and deploy
|
||||||
| [Cache dependencies](caching/index.md) | Cache your dependencies for a faster execution. |
|
| [Cache dependencies](caching/index.md) | Cache your dependencies for a faster execution. |
|
||||||
| [GitLab Runner](https://docs.gitlab.com/runner/) | Configure your own runners to execute your scripts. |
|
| [GitLab Runner](https://docs.gitlab.com/runner/) | Configure your own runners to execute your scripts. |
|
||||||
| [Pipeline efficiency](pipelines/pipeline_efficiency.md) | Configure your pipelines to run quickly and efficiently. |
|
| [Pipeline efficiency](pipelines/pipeline_efficiency.md) | Configure your pipelines to run quickly and efficiently. |
|
||||||
| [Test cases](test_cases/index.md) | Configure your pipelines to run quickly and efficiently. <!--- this seems to be a duplicate description ---> |
|
| [Test cases](test_cases/index.md) | Create testing scenarios. |
|
||||||
|
|
||||||
## Configuration
|
## Configuration
|
||||||
|
|
||||||
|
|
|
@ -174,7 +174,7 @@ They are:
|
||||||
- Script execution shell.
|
- Script execution shell.
|
||||||
- Not supported:
|
- Not supported:
|
||||||
- For definitions where the ["Expansion place"](#gitlab-ciyml-file) is GitLab.
|
- For definitions where the ["Expansion place"](#gitlab-ciyml-file) is GitLab.
|
||||||
- In the `only` and `except` [variables expressions](../jobs/job_control.md#cicd-variable-expressions).
|
- In the `only`, `except`, and `rules` [variables expressions](../jobs/job_control.md#cicd-variable-expressions).
|
||||||
|
|
||||||
Some of the persisted variables contain tokens and cannot be used by some definitions
|
Some of the persisted variables contain tokens and cannot be used by some definitions
|
||||||
due to security reasons.
|
due to security reasons.
|
||||||
|
|
|
@ -392,6 +392,13 @@ Do not use when describing a noun. For example:
|
||||||
|
|
||||||
See also [this, these, that, those](#this-these-that-those).
|
See also [this, these, that, those](#this-these-that-those).
|
||||||
|
|
||||||
|
## terminal
|
||||||
|
|
||||||
|
Lowercase. For example:
|
||||||
|
|
||||||
|
- Open a terminal.
|
||||||
|
- From a terminal, run the `docker login` command.
|
||||||
|
|
||||||
## there is, there are
|
## there is, there are
|
||||||
|
|
||||||
Try to avoid. These phrases hide the subject.
|
Try to avoid. These phrases hide the subject.
|
||||||
|
|
|
@ -162,19 +162,26 @@ The chosen OmniAuth provider is now active and can be used to sign in to GitLab
|
||||||
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36664) in GitLab 13.4.
|
> [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:
|
Automatic linking using this method works for all providers
|
||||||
|
[except the SAML provider](https://gitlab.com/gitlab-org/gitlab/-/issues/338293). For automatic
|
||||||
|
linking using the SAML provider, see [SAML-specific](saml.md#general-setup) instructions.
|
||||||
|
|
||||||
|
As an example, the following configuration is used to enable the auto link feature for both:
|
||||||
|
|
||||||
|
- OpenID Connect provider.
|
||||||
|
- Twitter OAuth provider.
|
||||||
|
|
||||||
**For Omnibus installations**
|
**For Omnibus installations**
|
||||||
|
|
||||||
```ruby
|
```ruby
|
||||||
gitlab_rails['omniauth_auto_link_user'] = ["saml", "twitter"]
|
gitlab_rails['omniauth_auto_link_user'] = ["openid_connect", "twitter"]
|
||||||
```
|
```
|
||||||
|
|
||||||
**For installations from source**
|
**For installations from source**
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
omniauth:
|
omniauth:
|
||||||
auto_link_user: ["saml", "twitter"]
|
auto_link_user: ["openid_connect", "twitter"]
|
||||||
```
|
```
|
||||||
|
|
||||||
## Configure OmniAuth Providers as External
|
## Configure OmniAuth Providers as External
|
||||||
|
|
Loading…
Reference in a new issue