X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5fd4fd13c2e4cb577d8d28de8526811941720d76..81b6599830e04cc45d7b847b7626015b76febf9f:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 618af37ac..a00712521 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,6 +2,7 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) + aasm (4.1.0) actionmailer (4.2.7) actionpack (= 4.2.7) actionview (= 4.2.7) @@ -170,6 +171,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) @@ -304,6 +308,7 @@ PLATFORMS DEPENDENCIES SystemTimer (>= 1.1.3) + aasm actionpack-page_caching autoprefixer-rails bigdecimal (~> 1.1.0) @@ -331,6 +336,7 @@ DEPENDENCIES oauth-plugin (>= 0.5.1) omniauth omniauth-facebook + omniauth-github omniauth-google-oauth2 (>= 0.2.7) omniauth-openid omniauth-windowslive