Don't route clicks on the dropdown menus

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index ef7b44f0d43bf91c1400614949bc7bd2417a72ef..27b5f5fa7df86eb81262e3fca1c60fefc8d59636 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -29,12 +29,12 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     arel (4.0.0)
-    atomic (1.1.13)
+    atomic (1.1.14)
     bigdecimal (1.1.0)
     builder (3.1.4)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.1)
+    cocaine (0.5.2)
       climate_control (>= 0.0.3, < 1.0)
     coffee-rails (4.0.0)
       coffee-script (>= 2.2.0)
@@ -45,17 +45,17 @@ GEM
     coffee-script-source (1.6.3)
     composite_primary_keys (6.0.0)
       activerecord (>= 4.0.0)
+    dalli (2.6.4)
     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
     ejs (1.1.1)
     erubis (2.7.0)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
+    execjs (2.0.2)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
     hike (1.2.3)
     htmlentities (4.3.1)
-    http_accept_language (1.0.2)
+    http_accept_language (2.0.0)
     httpauth (0.2.0)
     httpclient (2.3.4.1)
     i18n (0.6.5)
@@ -63,6 +63,7 @@ GEM
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
+    json (1.8.0)
     jsonify (0.3.1)
       multi_json (~> 1.0)
     jsonify-rails (0.3.2)
@@ -70,20 +71,25 @@ GEM
       jsonify (< 0.4.0)
     jwt (0.1.8)
       multi_json (>= 1.5)
+    kgio (2.8.1)
     libxml-ruby (2.7.0)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    memcached (1.7.0)
-    mime-types (1.24)
+    mime-types (1.25)
     mini_portile (0.5.1)
     minitest (4.7.5)
-    multi_json (1.7.9)
+    multi_json (1.8.1)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     oauth (0.4.7)
+    oauth-plugin (0.5.1)
+      multi_json
+      oauth (~> 0.4.4)
+      oauth2 (>= 0.5.0)
+      rack
     oauth2 (0.9.2)
       faraday (~> 0.8)
       httpauth (~> 0.2)
@@ -91,23 +97,18 @@ GEM
       multi_json (~> 1.0)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    open_id_authentication (1.1.0)
+    open_id_authentication (1.2.0)
       rack-openid (~> 1.3)
     openstreetmap-i18n-js (3.0.0.rc5.2)
       i18n
-    openstreetmap-oauth-plugin (0.4.1.2)
-      multi_json
-      oauth (~> 0.4.4)
-      oauth2 (>= 0.5.0)
-      rack
-    paperclip (2.8.0)
-      activerecord (>= 2.3.0)
-      activesupport (>= 2.3.2)
-      cocaine (>= 0.0.2)
+    paperclip (3.5.1)
+      activemodel (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (~> 0.5.0)
       mime-types
-    pg (0.16.0)
+    pg (0.17.0)
     polyglot (0.3.3)
-    psych (2.0.0)
+    psych (2.0.1)
     r2 (0.2.2)
     rack (1.5.2)
     rack-cors (0.2.8)
@@ -125,8 +126,9 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.0.0)
       sprockets-rails (~> 2.0.0)
-    rails-i18n (0.7.4)
-      i18n (~> 0.5)
+    rails-i18n (4.0.0)
+      i18n (~> 0.6)
+      rails (~> 4.0.0)
     railties (4.0.0)
       actionpack (= 4.0.0)
       activesupport (= 4.0.0)
@@ -135,10 +137,10 @@ GEM
     rake (10.1.0)
     redcarpet (3.0.0)
     rinku (1.7.3)
-    ruby-openid (2.2.3)
+    ruby-openid (2.3.0)
     sanitize (2.0.6)
       nokogiri (>= 1.4.4)
-    sass (3.2.10)
+    sass (3.2.12)
     sass-rails (4.0.0)
       railties (>= 4.0.0.beta, < 5.0)
       sass (>= 3.1.10)
@@ -153,15 +155,15 @@ GEM
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     thor (0.18.1)
-    thread_safe (0.1.2)
+    thread_safe (0.1.3)
       atomic
     tilt (1.4.1)
     timecop (0.6.3)
-    treetop (1.4.14)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
-    uglifier (2.1.2)
+    uglifier (2.2.1)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
     validates_email_format_of (1.5.3)
@@ -176,28 +178,30 @@ DEPENDENCIES
   bigdecimal (~> 1.1.0)
   coffee-rails (~> 4.0.0)
   composite_primary_keys (>= 6.0.0)
+  dalli
   deadlock_retry (>= 1.2.0)
   dynamic_form
   ejs
   htmlentities
-  http_accept_language (>= 1.0.2)
+  http_accept_language (~> 2.0.0)
   httpclient
   iconv (= 0.1)
   jquery-rails
+  json
   jsonify-rails
+  kgio
   libxml-ruby (>= 2.0.5)
-  memcached (>= 1.4.1)
   minitest (~> 4.7.0)
+  oauth-plugin (>= 0.5.1)
   open_id_authentication (>= 1.1.0)
   openstreetmap-i18n-js (>= 3.0.0.rc5.2)
-  openstreetmap-oauth-plugin (>= 0.4.1.1)
-  paperclip (~> 2.0)
+  paperclip (~> 3.0)
   pg
   psych
   r2
   rack-cors
   rails (= 4.0.0)
-  rails-i18n (>= 0.6.3)
+  rails-i18n (~> 4.0.0)
   redcarpet
   rinku (>= 1.2.2)
   ruby-openid (>= 2.2.0)