diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-04 09:09:16 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-04 09:09:16 +0000 |
commit | 7ea6cb331a8d50e201ef5da34dcfd62b93760c5b (patch) | |
tree | 1a4145ef8500214150cd6b6c004d737016b1bdc0 /doc/user/profile | |
parent | e3bdfa1a13d7e6c92716324c78b5b20c07eeb7c6 (diff) | |
download | gitlab-ce-7ea6cb331a8d50e201ef5da34dcfd62b93760c5b.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/profile')
-rw-r--r-- | doc/user/profile/account/two_factor_authentication.md | 2 | ||||
-rw-r--r-- | doc/user/profile/index.md | 2 |
2 files changed, 2 insertions, 2 deletions
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). |