X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7ed50894e2efdeaf0dd76087a99e46d6aea176c4..eeb9866d50e35b8f8b75e59aed582caba533778f:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index aa53ba8ba..8940c1fdf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -150,11 +150,21 @@ GEM omniauth (1.2.2) hashie (>= 1.2, < 4) rack (~> 1.0) + omniauth-oauth2 (1.2.0) + faraday (>= 0.8, < 0.10) + multi_json (~> 1.3) + oauth2 (~> 1.0) + omniauth (~> 1.2) omniauth-openid (1.0.1) omniauth (~> 1.0) rack-openid (~> 1.3.1) openstreetmap-i18n-js (3.0.0.rc5.3) i18n + openstreetmap-omniauth-google-oauth2 (0.2.6.1) + jwt (~> 1.0) + multi_json (~> 1.3) + omniauth (>= 1.1.1) + omniauth-oauth2 (>= 1.1.1) paperclip (4.2.1) activemodel (>= 3.0.0) activesupport (>= 3.0.0) @@ -305,6 +315,7 @@ DEPENDENCIES omniauth omniauth-openid openstreetmap-i18n-js (>= 3.0.0.rc5.3) + openstreetmap-omniauth-google-oauth2 (>= 0.2.6.1) paperclip (~> 4.0) pg poltergeist