diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-03-19 16:52:17 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-03-19 16:52:17 +0300 |
| commit | fbb83069deaad3db1239af66e6c9dc913f29f8f8 (patch) | |
| tree | 39cb78e0236db483a0f47edf399ddcaa754a80a6 /Gemfile.lock | |
| parent | e9da2b0c752b00e0af941bf1e33278a7d38cfeb9 (diff) | |
| parent | 34cb7057acec0b55b5c09bfc233d880a409fa16b (diff) | |
Merge branch 'update-omniauth-saml' into 'master'
Relax omniauth-saml 1.0.0 -> 1.10
Closes #14292
See merge request gitlab-org/gitlab-ce!17764
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 618fbf4b3e7..10fc33637f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1118,7 +1118,7 @@ DEPENDENCIES omniauth-google-oauth2 (~> 0.5.2) omniauth-kerberos (~> 0.3.0) omniauth-oauth2-generic (~> 0.2.2) - omniauth-saml (~> 1.10.0) + omniauth-saml (~> 1.10) omniauth-shibboleth (~> 1.2.0) omniauth-twitter (~> 1.2.0) omniauth_crowd (~> 2.2.0) |