diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-07 17:09:43 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-07 17:09:43 +0000 |
commit | 81fb0a9c18ce80c9a3b8f024abc8a905fc1b5a52 (patch) | |
tree | 37e7792443da60d42d6517387621d34ae16a7993 /Gemfile | |
parent | 030b5038b1ba84fb5570f064d53ee9b1328e43ea (diff) | |
parent | 33222b575603e6e24446ded8fa33ff36cfa25c0e (diff) | |
download | gitlab-ce-81fb0a9c18ce80c9a3b8f024abc8a905fc1b5a52.tar.gz |
Merge branch 'rs-update-omniauth-gems' into 'master'
Update omniauth-* gem dependencies
- twitter to `~> 1.2.0` - closes #2763
- kerberos to `~> 0.3.0` - closes #2792
- google-oauth2 to `~> 0.2.0`
- shibboleth to `~> 1.2.0` - closes #2791
See merge request !1526
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -22,20 +22,20 @@ gem "mysql2", '~> 0.3.16', group: :mysql gem "pg", '~> 0.18.2', group: :postgres # Authentication libraries -gem "devise", '~> 3.5.2' -gem "devise-async", '~> 0.9.0' -gem 'omniauth', "~> 1.2.2" -gem 'omniauth-google-oauth2', '~> 0.2.5' -gem 'omniauth-twitter', '~> 1.0.1' -gem 'omniauth-github', '~> 1.1.1' -gem 'omniauth-shibboleth', '~> 1.1.1' -gem 'omniauth-kerberos', '~> 0.2.0', group: :kerberos -gem 'omniauth-gitlab', '~> 1.0.0' -gem 'omniauth-bitbucket', '~> 0.0.2' -gem 'omniauth-saml', '~> 1.4.0' -gem 'doorkeeper', '~> 2.1.3' +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' +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.2.0' +gem 'omniauth-twitter', '~> 1.2.0' gem 'omniauth_crowd' -gem "rack-oauth2", "~> 1.0.5" +gem 'rack-oauth2', '~> 1.0.5' # Two-factor authentication gem 'devise-two-factor', '~> 2.0.0' |