diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-11 00:06:24 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-11 00:06:24 +0000 |
| commit | 133924c6cc443f5f69e1ab08d43b363d77677cb0 (patch) | |
| tree | e893a7d36105fc4acec7038feae5f03bd34cfc2c /doc | |
| parent | f607152a0802a68067343ad73f989033cb8e9a06 (diff) | |
| download | gitlab-ce-133924c6cc443f5f69e1ab08d43b363d77677cb0.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ci/yaml/README.md | 2 | ||||
| -rw-r--r-- | doc/user/profile/account/delete_account.md | 1 | ||||
| -rw-r--r-- | doc/user/profile/account/two_factor_authentication.md | 6 |
3 files changed, 8 insertions, 1 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 71871d1b1b7..a9f30a5ddd4 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -666,7 +666,7 @@ build: CAUTION: **Warning:** There are some points to be aware of when -[using this feature with new branches or tags *without* pipelines for merge requests](using-onlychanges-without-pipelines-for-merge-requests). +[using this feature with new branches or tags *without* pipelines for merge requests](#using-onlychanges-without-pipelines-for-merge-requests). ##### Using `only:changes` with pipelines for merge requests diff --git a/doc/user/profile/account/delete_account.md b/doc/user/profile/account/delete_account.md index fda0936355e..65896bd19cd 100644 --- a/doc/user/profile/account/delete_account.md +++ b/doc/user/profile/account/delete_account.md @@ -55,6 +55,7 @@ A deactivated user: - Cannot access Git repositories or the API. - Will not receive any notifications from GitLab. +- Will not be able to use [slash commands](../../../integration/slash_commands.md). Personal projects, group and user history of the deactivated user will be left intact. diff --git a/doc/user/profile/account/two_factor_authentication.md b/doc/user/profile/account/two_factor_authentication.md index 5721e9858f1..108d4f0b387 100644 --- a/doc/user/profile/account/two_factor_authentication.md +++ b/doc/user/profile/account/two_factor_authentication.md @@ -244,6 +244,12 @@ Sign in and re-enable two-factor authentication as soon as possible. - The user logs out and attempts to log in via `second.host.xyz` - U2F authentication fails, because the U2F key has only been registered on `first.host.xyz`. +## Troubleshooting + +If you are receiving an `invalid pin code` error, this may indicate that there is a time sync issue between the authentication application and the GitLab instance itself. + +Most authentication apps have a feature in the settings for syncing the time for the codes themselves. For Google Authenticator for example, go to `Settings > Time correction for codes`. + <!-- ## Troubleshooting Include any troubleshooting steps that you can foresee. If you know beforehand what issues |