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 /Gemfile.lock | |
| 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 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 2e9cb1a956f..29c37bc7f1f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -555,9 +555,6 @@ GEM jwt (>= 1.5) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.5) - omniauth-jwt (0.0.2) - jwt - omniauth (~> 1.1) omniauth-kerberos (0.3.0) omniauth-multipassword timfel-krb5-auth (~> 0.8) @@ -1117,7 +1114,6 @@ DEPENDENCIES omniauth-github (~> 1.1.1) omniauth-gitlab (~> 1.0.2) omniauth-google-oauth2 (~> 0.5.3) - omniauth-jwt (~> 0.0.2) omniauth-kerberos (~> 0.3.0) omniauth-oauth2-generic (~> 0.2.2) omniauth-saml (~> 1.10) |