diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-01-22 09:29:15 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-01-22 09:29:15 +0000 |
| commit | f49a5940790719a4fa8898972069c1c9f835a99a (patch) | |
| tree | b80aabc6f8ddfea4a38e6bd2b84549cbfbd4175d | |
| parent | 3e65fa5424ea53474cbd0a988b590598d86e41bc (diff) | |
| parent | dba2e9c31807725dfd3e40bd055f11a15cf68d32 (diff) | |
| download | gitlab-ce-f49a5940790719a4fa8898972069c1c9f835a99a.tar.gz | |
Merge branch 'minor_fix_2fa_security' into 'master'
Add image to 2fa security documentation
See merge request !2549
| -rw-r--r-- | doc/security/img/two_factor_authentication_settings.png | bin | 0 -> 20399 bytes | |||
| -rw-r--r-- | doc/security/two_factor_authentication.md | 15 |
2 files changed, 11 insertions, 4 deletions
diff --git a/doc/security/img/two_factor_authentication_settings.png b/doc/security/img/two_factor_authentication_settings.png Binary files differnew file mode 100644 index 00000000000..aa51ce030bb --- /dev/null +++ b/doc/security/img/two_factor_authentication_settings.png diff --git a/doc/security/two_factor_authentication.md b/doc/security/two_factor_authentication.md index 4e25a1fdc3f..8365bdb7b1b 100644 --- a/doc/security/two_factor_authentication.md +++ b/doc/security/two_factor_authentication.md @@ -20,7 +20,13 @@ In the Admin area under **Settings** (`/admin/application_settings`), look for the "Sign-in Restrictions" area, where you can configure both. If you want 2FA enforcement to take effect on next login, change the grace -period to `0` +period to `0`. + +--- + + + +--- ## Disabling 2FA for everyone @@ -28,11 +34,12 @@ There may be some special situations where you want to disable 2FA for everyone even when forced 2FA is disabled. There is a rake task for that: ``` -# use this command if you've installed GitLab with the Omnibus package +# Omnibus installations sudo gitlab-rake gitlab:two_factor:disable_for_all_users -# if you've installed GitLab from source +# Installations from source sudo -u git -H bundle exec rake gitlab:two_factor:disable_for_all_users RAILS_ENV=production ``` -**IMPORTANT: this is a permanent and irreversible action. Users will have to reactivate 2FA from scratch if they want to use it again.** +**IMPORTANT: this is a permanent and irreversible action. Users will have to + reactivate 2FA from scratch if they want to use it again.** |
