diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-03-27 12:06:12 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-03-27 12:06:12 +0300 |
| commit | 678af224a235e621530e13dd2b96bf2b1caff725 (patch) | |
| tree | cf0da8bdf099efdfac63f50d6b7c3cb33cac203e /Gemfile.lock | |
| parent | ffa73498b1c3125eec6d51db4502ab22da664773 (diff) | |
| parent | 775796cdf776f00b5dafe27e2eaafff3f322c5a7 (diff) | |
Merge branch '43512-add-support-for-omniauth-jwt-provider' into 'master'
Resolve "Add support for omniauth-jwt provider"
Closes #43512
See merge request gitlab-org/gitlab-ce!17774
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 61107a2130b..fcffe45acbf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -554,6 +554,9 @@ GEM multi_json (~> 1.3) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.3.1) + omniauth-jwt (0.0.2) + jwt + omniauth (~> 1.1) omniauth-kerberos (0.3.0) omniauth-multipassword timfel-krb5-auth (~> 0.8) @@ -1115,6 +1118,7 @@ DEPENDENCIES omniauth-github (~> 1.1.1) omniauth-gitlab (~> 1.0.2) omniauth-google-oauth2 (~> 0.5.2) + omniauth-jwt (~> 0.0.2) omniauth-kerberos (~> 0.3.0) omniauth-oauth2-generic (~> 0.2.2) omniauth-saml (~> 1.10) |