diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-04-30 08:52:55 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-04-30 08:52:55 +0000 |
| commit | fa7b98d508a047f258b4f72d9063ec080c21cbcb (patch) | |
| tree | 763b52eedbf03005d59f7e2da5e84b177483a9d2 /config | |
| parent | 7160be148e759f89d6deb3e733f536822f0dbcd5 (diff) | |
| parent | 772b876a939d45530aad9f4134db1cd3232985f8 (diff) | |
| download | gitlab-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 'config')
| -rw-r--r-- | config/gitlab.yml.example | 4 | ||||
| -rw-r--r-- | config/initializers/omniauth.rb | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 6aad8e93dcc..7eb44b8059e 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -534,7 +534,7 @@ production: &base # required_claims: ["name", "email"], # info_map: { name: "name", email: "email" }, # auth_url: 'https://example.com/', - # valid_within: nil, + # valid_within: null, # } # } # - { name: 'saml', @@ -825,7 +825,7 @@ test: required_claims: ["name", "email"], info_map: { name: "name", email: "email" }, auth_url: 'https://example.com/', - valid_within: nil, + valid_within: null, } } - { name: 'auth0', diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 00baea08613..e33ebb25c4c 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -25,5 +25,6 @@ end module OmniAuth module Strategies autoload :Bitbucket, Rails.root.join('lib', 'omni_auth', 'strategies', 'bitbucket') + autoload :Jwt, Rails.root.join('lib', 'omni_auth', 'strategies', 'jwt') end end |