X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/724a9885953e381f2e8805ef9f5bc119c6f924e4..b0150caee632110eb5b305f9937b94473101645a:/Gemfile.lock?ds=inline

diff --git a/Gemfile.lock b/Gemfile.lock
index c06661496..7c8691a22 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -79,16 +79,20 @@ 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)
     httpclient (2.6.0.1)
     i18n (0.7.0)
-    iconv (0.1)
     jquery-rails (4.0.3)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    jshint (1.3.1)
+      execjs (>= 1.4.0)
+      multi_json (~> 1.0)
+      therubyracer (~> 0.12.1)
     json (1.8.2)
     jsonify (0.3.1)
       multi_json (~> 1.0)
@@ -103,6 +107,7 @@ GEM
       colorize
       railties (>= 3.1, < 5)
       sprockets
+    libv8 (3.16.14.7)
     libxml-ruby (2.8.0)
     loofah (2.0.1)
       nokogiri (>= 1.5.9)
@@ -130,8 +135,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)
@@ -152,7 +161,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)
@@ -187,6 +196,7 @@ GEM
     rainbow (2.0.0)
     rake (10.4.2)
     redcarpet (3.2.2)
+    ref (1.0.5)
     rinku (1.7.3)
     rubocop (0.29.1)
       astrolabe (~> 1.3)
@@ -196,7 +206,7 @@ GEM
       ruby-progressbar (~> 1.4)
     ruby-openid (2.6.0)
     ruby-progressbar (1.7.1)
-    sanitize (3.1.1)
+    sanitize (3.1.2)
       crass (~> 1.0.1)
       nokogiri (>= 1.4.4)
       nokogumbo (= 1.2.0)
@@ -217,6 +227,9 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
+    therubyracer (0.12.1)
+      libv8 (~> 3.16.14.0)
+      ref
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
@@ -229,7 +242,7 @@ GEM
     validates_email_format_of (1.6.2)
       i18n
     vendorer (0.1.16)
-    websocket-driver (0.5.2)
+    websocket-driver (0.5.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     xpath (2.0.0)
@@ -251,8 +264,8 @@ DEPENDENCIES
   htmlentities
   http_accept_language (~> 2.0.0)
   httpclient
-  iconv (= 0.1)
   jquery-rails
+  jshint
   json
   jsonify-rails
   kgio
@@ -260,7 +273,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
@@ -273,7 +287,6 @@ DEPENDENCIES
   redcarpet
   rinku (>= 1.2.2)
   rubocop
-  ruby-openid (>= 2.2.0)
   sanitize
   sass-rails (~> 5.0)
   soap4r-ruby1.9