diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-02-03 19:21:26 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-02-03 19:21:26 +0000 |
| commit | 23af5fc2722588da6b559ce3172d7cf642aec940 (patch) | |
| tree | 0f235505c4051295db71531e63080f4814d4f9bb | |
| parent | d506b3f958654534de93f443b9a81ba4434c0b71 (diff) | |
| parent | ea7bdc78eed8db7ff4b5440b282678b1c5b021f7 (diff) | |
| download | gitlab-ce-23af5fc2722588da6b559ce3172d7cf642aec940.tar.gz | |
Merge branch 'omniauth-saml-update' into 'master'
Updated omniuath-saml to the latest version.
See merge request !2684
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -30,7 +30,7 @@ gem 'omniauth-github', '~> 1.1.1' gem 'omniauth-gitlab', '~> 1.0.0' gem 'omniauth-google-oauth2', '~> 0.2.0' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos -gem 'omniauth-saml', '~> 1.4.0' +gem 'omniauth-saml', '~> 1.4.2' gem 'omniauth-shibboleth', '~> 1.2.0' gem 'omniauth-twitter', '~> 1.2.0' gem 'omniauth_crowd', '~> 2.2.0' diff --git a/Gemfile.lock b/Gemfile.lock index 62937ab6fd2..bd767016108 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -532,9 +532,9 @@ GEM omniauth-oauth2 (1.3.1) oauth2 (~> 1.0) omniauth (~> 1.2) - omniauth-saml (1.4.1) + omniauth-saml (1.4.2) omniauth (~> 1.1) - ruby-saml (~> 1.0.0) + ruby-saml (~> 1.1, >= 1.1.1) omniauth-shibboleth (1.2.1) omniauth (>= 1.0.0) omniauth-twitter (1.2.1) @@ -690,7 +690,7 @@ GEM ruby-fogbugz (0.2.1) crack (~> 0.4) ruby-progressbar (1.7.5) - ruby-saml (1.0.0) + ruby-saml (1.1.1) nokogiri (>= 1.5.10) uuid (~> 2.3) ruby2ruby (2.2.0) @@ -974,7 +974,7 @@ DEPENDENCIES omniauth-gitlab (~> 1.0.0) omniauth-google-oauth2 (~> 0.2.0) omniauth-kerberos (~> 0.3.0) - omniauth-saml (~> 1.4.0) + omniauth-saml (~> 1.4.2) omniauth-shibboleth (~> 1.2.0) omniauth-twitter (~> 1.2.0) omniauth_crowd (~> 2.2.0) |