diff options
author | Robert Speicher <robert@gitlab.com> | 2016-02-03 19:21:26 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-03 15:13:59 -0500 |
commit | 07556b561ead98741256de1c918f311d93566840 (patch) | |
tree | 14cac70c82bb776f4ac1afc183d3b9887087fbe1 | |
parent | eb6f6917609d031044ac763c4f8f3fafc1ea27fa (diff) | |
download | gitlab-ce-07556b561ead98741256de1c918f311d93566840.tar.gz |
Merge branch 'omniauth-saml-update' into 'master'
Updated omniuath-saml to the latest version.
See merge request !2684
-rw-r--r-- | CHANGELOG | 3 | ||||
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 8 |
3 files changed, 8 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG index 24c08358b67..f1174ccab7b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,8 @@ Please view this file on the master branch, on stable branches it's out of date. +v 8.4.4 + - Update omniauth-saml gem to 1.4.2 + v 8.4.3 - Increase lfs_objects size column to 8-byte integer to allow files larger than 2.1GB @@ -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 8128203e2fe..519c4729e82 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -534,9 +534,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) @@ -692,7 +692,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) @@ -975,7 +975,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) |