summaryrefslogtreecommitdiff
path: root/doc/administration
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-04-30 08:52:55 +0000
committerDouwe Maan <douwe@gitlab.com>2018-04-30 08:52:55 +0000
commitfa7b98d508a047f258b4f72d9063ec080c21cbcb (patch)
tree763b52eedbf03005d59f7e2da5e84b177483a9d2 /doc/administration
parent7160be148e759f89d6deb3e733f536822f0dbcd5 (diff)
parent772b876a939d45530aad9f4134db1cd3232985f8 (diff)
downloadgitlab-ce-fa7b98d508a047f258b4f72d9063ec080c21cbcb.tar.gz
Merge branch 'add-jwt-strategy-to-gitlab-suite' into 'master'
Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suite See merge request gitlab-org/gitlab-ce!18580
Diffstat (limited to 'doc/administration')
-rw-r--r--doc/administration/auth/jwt.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/administration/auth/jwt.md b/doc/administration/auth/jwt.md
index b51e705ab52..8b00f52ffc1 100644
--- a/doc/administration/auth/jwt.md
+++ b/doc/administration/auth/jwt.md
@@ -50,7 +50,7 @@ JWT will provide you with a secret key for you to use.
required_claims: ["name", "email"],
info_map: { name: "name", email: "email" },
auth_url: 'https://example.com/',
- valid_within: nil,
+ valid_within: null,
}
}
```