X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5fd4fd13c2e4cb577d8d28de8526811941720d76..1b1693b8fe8c705bb7769de11c069e85dce989c3:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 618af37ac..5a9456b35 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -83,6 +83,11 @@ GEM erubis (2.7.0) execjs (2.7.0) exifr (1.2.4) + factory_girl (4.7.0) + activesupport (>= 3.0.0) + factory_girl_rails (4.7.0) + factory_girl (~> 4.7.0) + railties (>= 3.0.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) fspath (2.1.1) @@ -170,6 +175,9 @@ GEM rack (>= 1.0, < 3) omniauth-facebook (3.0.0) omniauth-oauth2 (~> 1.2) + omniauth-github (1.1.2) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.1) omniauth-google-oauth2 (0.4.1) jwt (~> 1.5.2) multi_json (~> 1.3) @@ -313,6 +321,7 @@ DEPENDENCIES dalli deadlock_retry (>= 1.2.0) dynamic_form + factory_girl_rails faraday htmlentities http_accept_language (~> 2.0.0) @@ -331,6 +340,7 @@ DEPENDENCIES oauth-plugin (>= 0.5.1) omniauth omniauth-facebook + omniauth-github omniauth-google-oauth2 (>= 0.2.7) omniauth-openid omniauth-windowslive