diff options
author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-04-25 11:17:35 +0100 |
---|---|---|
committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-04-26 10:13:29 +0100 |
commit | 699ecad78c792a77f951ab9117bb1ae480b29716 (patch) | |
tree | be8fba1b8a26427d1b6e04f6b59967dc4c06ac2d /config | |
parent | e6f6f8e7a3af3cd577075d1ac9ce287867c3e429 (diff) | |
download | gitlab-ce-699ecad78c792a77f951ab9117bb1ae480b29716.tar.gz |
Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suite
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 8c39a1f2aa9..722ac67da0b 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -532,7 +532,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', @@ -823,7 +823,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 |