diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-11 15:32:39 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-11 15:32:39 +0000 |
| commit | 701e9ee4519200445a54ee200475a71e2253abe9 (patch) | |
| tree | a481a31b169543cbe4b90384d2a8583cd0688e9c | |
| parent | 5500f9159f2f187a13a3854fc8f2d8a788c65e30 (diff) | |
| parent | 0f2e4198ec35e2e6b8a424b8f6618d4c3e87d1ad (diff) | |
| download | gitlab-ce-701e9ee4519200445a54ee200475a71e2253abe9.tar.gz | |
Merge branch 'rs-omniauth-client-versions' into 'master'
Add versions to omniauth_crowd and omniauth-azure-oauth2
Also sorts them alphabetically, because OCD.
See merge request !2364
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -22,6 +22,7 @@ gem 'devise', '~> 3.5.3' gem 'devise-async', '~> 0.9.0' gem 'doorkeeper', '~> 2.2.0' gem 'omniauth', '~> 1.2.2' +gem 'omniauth-azure-oauth2', '~> 0.0.6' gem 'omniauth-bitbucket', '~> 0.0.2' gem 'omniauth-cas3', '~> 1.1.2' gem 'omniauth-facebook', '~> 3.0.0' @@ -32,8 +33,7 @@ gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos gem 'omniauth-saml', '~> 1.4.0' gem 'omniauth-shibboleth', '~> 1.2.0' gem 'omniauth-twitter', '~> 1.2.0' -gem 'omniauth_crowd' -gem 'omniauth-azure-oauth2' +gem 'omniauth_crowd', '~> 2.2.0' gem 'rack-oauth2', '~> 1.2.1' # reCAPTCHA protection diff --git a/Gemfile.lock b/Gemfile.lock index 96bf2bd1a2e..db0104eee84 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -919,7 +919,7 @@ DEPENDENCIES oauth2 (~> 1.0.0) octokit (~> 3.7.0) omniauth (~> 1.2.2) - omniauth-azure-oauth2 + omniauth-azure-oauth2 (~> 0.0.6) omniauth-bitbucket (~> 0.0.2) omniauth-cas3 (~> 1.1.2) omniauth-facebook (~> 3.0.0) @@ -930,7 +930,7 @@ DEPENDENCIES omniauth-saml (~> 1.4.0) omniauth-shibboleth (~> 1.2.0) omniauth-twitter (~> 1.2.0) - omniauth_crowd + omniauth_crowd (~> 2.2.0) org-ruby (~> 0.9.12) paranoia (~> 2.0) pg (~> 0.18.2) |