diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-10-06 22:03:42 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-10-06 22:03:42 -0400 |
| commit | 33222b575603e6e24446ded8fa33ff36cfa25c0e (patch) | |
| tree | 5dda26347b4951e0bf900aed8575cbc5b44ee364 | |
| parent | 59abf498c67872da702ee35832859f6c07b37a8e (diff) | |
| download | gitlab-ce-rs-update-omniauth-gems.tar.gz | |
Update omniauth-shibboleth to ~> 1.2.0rs-update-omniauth-gems
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -24,6 +24,7 @@ gem "pg", '~> 0.18.2', group: :postgres # Authentication libraries gem 'devise', '~> 3.5.2' gem 'devise-async', '~> 0.9.0' +gem 'doorkeeper', '~> 2.1.3' gem 'omniauth', '~> 1.2.2' gem 'omniauth-bitbucket', '~> 0.0.2' gem 'omniauth-github', '~> 1.1.1' @@ -31,10 +32,9 @@ 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-shibboleth', '~> 1.1.1' +gem 'omniauth-shibboleth', '~> 1.2.0' gem 'omniauth-twitter', '~> 1.2.0' gem 'omniauth_crowd' -gem 'doorkeeper', '~> 2.1.3' gem 'rack-oauth2', '~> 1.0.5' # Two-factor authentication diff --git a/Gemfile.lock b/Gemfile.lock index 87c9f5aa08e..1ae60c62d6d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -454,7 +454,7 @@ GEM omniauth-saml (1.4.1) omniauth (~> 1.1) ruby-saml (~> 1.0.0) - omniauth-shibboleth (1.1.2) + omniauth-shibboleth (1.2.1) omniauth (>= 1.0.0) omniauth-twitter (1.2.1) json (~> 1.3) @@ -870,10 +870,10 @@ DEPENDENCIES omniauth-bitbucket (~> 0.0.2) omniauth-github (~> 1.1.1) omniauth-gitlab (~> 1.0.0) - omniauth-google-oauth2 (~> 0.2.5) + omniauth-google-oauth2 (~> 0.2.0) omniauth-kerberos (~> 0.3.0) omniauth-saml (~> 1.4.0) - omniauth-shibboleth (~> 1.1.1) + omniauth-shibboleth (~> 1.2.0) omniauth-twitter (~> 1.2.0) omniauth_crowd org-ruby (~> 0.9.12) |