X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6671a934bf10ad202576d5ca0c1591cf2ef627f8..9f263dd9c324ae9774e333da48361e8d0e9129ec:/Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index f40dc2b72..7de1743dc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -69,9 +69,16 @@ GEM
     colorize (0.7.5)
     composite_primary_keys (8.0.0)
       activerecord (~> 4.2.0)
+    coveralls (0.7.11)
+      multi_json (~> 1.10)
+      rest-client (>= 1.6.8, < 2)
+      simplecov (~> 0.9.1)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.1)
     crass (1.0.1)
     dalli (2.7.2)
     deadlock_retry (1.2.0)
+    docile (1.1.5)
     dynamic_form (1.1.4)
     erubis (2.7.0)
     execjs (2.3.0)
@@ -79,6 +86,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     globalid (0.3.3)
       activesupport (>= 4.1.0)
+    hashie (3.4.0)
     hike (1.2.3)
     htmlentities (4.3.3)
     http_accept_language (2.0.5)
@@ -98,7 +106,7 @@ GEM
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)
-    jwt (1.2.1)
+    jwt (1.3.0)
     kgio (2.9.3)
     konacha (3.3.0)
       actionpack (>= 3.1, < 5)
@@ -118,6 +126,7 @@ GEM
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
+    netrc (0.10.3)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     nokogumbo (1.2.0)
@@ -134,8 +143,12 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    open_id_authentication (1.2.0)
-      rack-openid (~> 1.3)
+    omniauth (1.2.2)
+      hashie (>= 1.2, < 4)
+      rack (~> 1.0)
+    omniauth-openid (1.0.1)
+      omniauth (~> 1.0)
+      rack-openid (~> 1.3.1)
     openstreetmap-i18n-js (3.0.0.rc5.3)
       i18n
     paperclip (4.2.1)
@@ -156,7 +169,7 @@ GEM
     r2 (0.2.5)
     rack (1.6.0)
     rack-cors (0.3.1)
-    rack-openid (1.4.2)
+    rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-test (0.6.3)
@@ -180,7 +193,7 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.1)
       loofah (~> 2.0)
-    rails-i18n (4.0.3)
+    rails-i18n (4.0.4)
       i18n (~> 0.6)
       railties (~> 4.0)
     railties (4.2.0)
@@ -192,6 +205,9 @@ GEM
     rake (10.4.2)
     redcarpet (3.2.2)
     ref (1.0.5)
+    rest-client (1.7.3)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     rinku (1.7.3)
     rubocop (0.29.1)
       astrolabe (~> 1.3)
@@ -205,13 +221,18 @@ GEM
       crass (~> 1.0.1)
       nokogiri (>= 1.4.4)
       nokogumbo (= 1.2.0)
-    sass (3.4.12)
+    sass (3.4.13)
     sass-rails (5.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (~> 1.1)
+    simplecov (0.9.2)
+      docile (~> 1.1.0)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
     soap4r-ruby1.9 (2.0.5)
     sprockets (2.12.3)
       hike (~> 1.2)
@@ -222,6 +243,8 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
@@ -229,9 +252,10 @@ GEM
     thread_safe (0.3.4)
     tilt (1.4.1)
     timecop (0.7.3)
+    tins (1.3.4)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.7.0)
+    uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     validates_email_format_of (1.6.2)
@@ -253,9 +277,11 @@ DEPENDENCIES
   bigdecimal (~> 1.1.0)
   coffee-rails (~> 4.1.0)
   composite_primary_keys (~> 8.0.0)
+  coveralls
   dalli
   deadlock_retry (>= 1.2.0)
   dynamic_form
+  faraday
   htmlentities
   http_accept_language (~> 2.0.0)
   httpclient
@@ -268,7 +294,8 @@ DEPENDENCIES
   libxml-ruby (>= 2.0.5)
   minitest (~> 5.1)
   oauth-plugin (>= 0.5.1)
-  open_id_authentication (>= 1.1.0)
+  omniauth
+  omniauth-openid
   openstreetmap-i18n-js (>= 3.0.0.rc5.3)
   paperclip (~> 4.0)
   pg
@@ -281,7 +308,6 @@ DEPENDENCIES
   redcarpet
   rinku (>= 1.2.2)
   rubocop
-  ruby-openid (>= 2.2.0)
   sanitize
   sass-rails (~> 5.0)
   soap4r-ruby1.9