Merge branch 'master' into 'docs-hard-tabs'docs-hard-tabs

# Conflicts:
#   doc/administration/pseudonymizer.md
#   doc/administration/uploads.md

1 files changed, 28 insertions, 0 deletions

diff --git a/doc/administration/auth/smartcard.md b/doc/administration/auth/smartcard.md
index 2f3289d6102..a0d4e9ef3b5 100644
--- a/doc/administration/auth/smartcard.md
+++ b/doc/administration/auth/smartcard.md
@@ -184,3 +184,31 @@ attribute. As a prerequisite, you must use an LDAP server that:
 
 1. Save the file and [restart](../restart_gitlab.md#installations-from-source)
    GitLab for the changes to take effect.
+
+### Require browser session with smartcard sign-in for Git access
+
+**For Omnibus installations**
+
+1. Edit `/etc/gitlab/gitlab.rb`:
+
+    ```ruby
+    gitlab_rails['smartcard_required_for_git_access'] = true
+    ```
+
+1. Save the file and [reconfigure](../restart_gitlab.md#omnibus-gitlab-reconfigure)
+   GitLab for the changes to take effect.
+
+**For installations from source**
+
+1. Edit `config/gitlab.yml`:
+
+    ```yaml
+    ## Smartcard authentication settings
+    smartcard:
+      # snip...
+      # Browser session with smartcard sign-in is required for Git access
+      required_for_git_access: true
+    ```
+
+1. Save the file and [restart](../restart_gitlab.md#installations-from-source)
+   GitLab for the changes to take effect.