diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-09-14 13:54:19 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-09-14 13:54:19 +0000 |
| commit | 0dd192af91dd64e504ec08e8632f8e939adcfd3d (patch) | |
| tree | 979789e56a2e542d089c2e3e7b3f5ef5087ccead | |
| parent | 72e9f63ff722585ba75abbf4635f649e88709a70 (diff) | |
| parent | d8b7bb981294995166dd27e8fbd5a8dd1e8a8858 (diff) | |
| download | gitlab-ce-0dd192af91dd64e504ec08e8632f8e939adcfd3d.tar.gz | |
Merge branch '21748-updating-omniauth-facebook' into 'master'
Update omniauth-facebook to '~>4.0.0'
## What does this MR do?
Update omniauth-facebook to '~>4.0.0'
## What are the relevant issue numbers?
Closes #21748
cc @ubudzisz @yorickpeterse @grzesiek @tmaczukin
See merge request !6321
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -26,7 +26,7 @@ gem 'omniauth-auth0', '~> 1.4.1' 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' +gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.1.1' gem 'omniauth-gitlab', '~> 1.0.0' gem 'omniauth-google-oauth2', '~> 0.4.1' diff --git a/Gemfile.lock b/Gemfile.lock index b6307f72fa8..c559d09718b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -333,7 +333,7 @@ GEM temple (~> 0.7.6) thor tilt - hashie (3.4.3) + hashie (3.4.4) health_check (2.1.0) rails (>= 4.0) hipchat (1.5.2) @@ -444,7 +444,7 @@ GEM addressable (~> 2.3) nokogiri (~> 1.6.6) omniauth (~> 1.2) - omniauth-facebook (3.0.0) + omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) omniauth-github (1.1.2) omniauth (~> 1.0) @@ -909,7 +909,7 @@ DEPENDENCIES omniauth-azure-oauth2 (~> 0.0.6) omniauth-bitbucket (~> 0.0.2) omniauth-cas3 (~> 1.1.2) - omniauth-facebook (~> 3.0.0) + omniauth-facebook (~> 4.0.0) omniauth-github (~> 1.1.1) omniauth-gitlab (~> 1.0.0) omniauth-google-oauth2 (~> 0.4.1) |