Make switching data browser to current map view work

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 7e2195198f0a704ca3040c18ff3658c987e8b474..f434a6a68f0840035372970dfaa748f7da790ac3 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,35 +2,36 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)

-    actionmailer (3.2.3)
-      actionpack (= 3.2.3)
+    actionmailer (3.2.6)
+      actionpack (= 3.2.6)

       mail (~> 2.4.4)
       mail (~> 2.4.4)

-    actionpack (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    actionpack (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)

       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)

-      sprockets (~> 2.1.2)
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.6)
+      activesupport (= 3.2.6)

       builder (~> 3.0.0)
       builder (~> 3.0.0)

-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    activerecord (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)

       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)

-    activeresource (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-    activesupport (3.2.3)
+    activeresource (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+    activesupport (3.2.6)

       i18n (~> 0.6)
       multi_json (~> 1.0)
       i18n (~> 0.6)
       multi_json (~> 1.0)

-    addressable (2.2.7)

     arel (3.0.2)
     arel (3.0.2)

+    bigdecimal (1.1.0)
+    browser (0.1.4)

     builder (3.0.0)
     cocaine (0.2.1)
     coffee-rails (3.2.2)
     builder (3.0.0)
     cocaine (0.2.1)
     coffee-rails (3.2.2)


@@ -39,51 +40,53 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script (2.2.0)
       coffee-script-source
       execjs

-    coffee-script-source (1.2.0)
+    coffee-script-source (1.3.3)

     composite_primary_keys (5.0.4)
       activerecord (~> 3.2.0)
     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
     erubis (2.7.0)
     composite_primary_keys (5.0.4)
       activerecord (~> 3.2.0)
     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
     erubis (2.7.0)

-    execjs (1.3.0)
+    execjs (1.4.0)

       multi_json (~> 1.0)
       multi_json (~> 1.0)

-    faraday (0.7.6)
-      addressable (~> 2.2)
+    faraday (0.8.1)

       multipart-post (~> 1.1)
       multipart-post (~> 1.1)

-      rack (~> 1.1)

     hike (1.2.1)
     htmlentities (4.3.1)
     http_accept_language (1.0.2)
     hike (1.2.1)
     htmlentities (4.3.1)
     http_accept_language (1.0.2)

-    httpclient (2.2.4)
+    httpauth (0.1)
+    httpclient (2.2.5)

     i18n (0.6.0)
     iconv (0.1)
     i18n (0.6.0)
     iconv (0.1)

-    journey (1.0.3)
-    jquery-rails (2.0.1)
+    journey (1.0.4)
+    jquery-rails (2.0.2)

       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)

-    json (1.6.6)
+    json (1.7.3)

     libv8 (3.3.10.4)
     libxml-ruby (2.3.2)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     libv8 (3.3.10.4)
     libxml-ruby (2.3.2)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)

-    memcached (1.4.1)
+    memcached (1.4.2)

     mime-types (1.18)
     mime-types (1.18)

-    multi_json (1.2.0)
+    minitest (3.1.0)
+    multi_json (1.3.6)

     multipart-post (1.1.5)
     multipart-post (1.1.5)

-    nokogiri (1.5.2)
-    oauth (0.4.5)
-    oauth-plugin (0.4.0.rc2)
-      multi_json
-      oauth (~> 0.4.4)
-      oauth2
-      rack
-    oauth2 (0.5.2)
-      faraday (~> 0.7)
+    nokogiri (1.5.4)
+    oauth (0.4.6)
+    oauth2 (0.7.1)
+      faraday (~> 0.8)
+      httpauth (~> 0.1)

       multi_json (~> 1.0)
       multi_json (~> 1.0)

+      rack (~> 1.4)

     open_id_authentication (1.1.0)
       rack-openid (~> 1.3)
     open_id_authentication (1.1.0)
       rack-openid (~> 1.3)

+    openstreetmap-oauth-plugin (0.4.0.1)
+      multi_json
+      oauth (~> 0.4.4)
+      oauth2 (>= 0.5.0)
+      rack

     paperclip (2.7.0)
       activerecord (>= 2.3.0)
       activesupport (>= 2.3.2)
     paperclip (2.7.0)
       activerecord (>= 2.3.0)
       activesupport (>= 2.3.2)


@@ -101,23 +104,23 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)

-    rails (3.2.3)
-      actionmailer (= 3.2.3)
-      actionpack (= 3.2.3)
-      activerecord (= 3.2.3)
-      activeresource (= 3.2.3)
-      activesupport (= 3.2.3)
+    rails (3.2.6)
+      actionmailer (= 3.2.6)
+      actionpack (= 3.2.6)
+      activerecord (= 3.2.6)
+      activeresource (= 3.2.6)
+      activesupport (= 3.2.6)

       bundler (~> 1.0)
       bundler (~> 1.0)

-      railties (= 3.2.3)
-    rails-i18n (0.6.2)
+      railties (= 3.2.6)
+    rails-i18n (0.6.4)

       i18n (~> 0.5)
       i18n (~> 0.5)

-    railties (3.2.3)
-      actionpack (= 3.2.3)
-      activesupport (= 3.2.3)
+    railties (3.2.6)
+      actionpack (= 3.2.6)
+      activesupport (= 3.2.6)

       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)

-      thor (~> 0.14.6)
+      thor (>= 0.14.6, < 2.0)

     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)


@@ -126,24 +129,24 @@ GEM
     ruby-openid (2.1.8)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
     ruby-openid (2.1.8)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)

-    sass (3.1.15)
+    sass (3.1.19)

     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)

-    sprockets (2.1.2)
+    sprockets (2.1.3)

       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)

-    therubyracer (0.10.0)
+    therubyracer (0.10.1)

       libv8 (~> 3.3.10)
       libv8 (~> 3.3.10)

-    thor (0.14.6)
+    thor (0.15.2)

     tilt (1.3.3)
     timecop (0.3.5)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
     tilt (1.3.3)
     timecop (0.3.5)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)

-    tzinfo (0.3.32)
+    tzinfo (0.3.33)

     uglifier (1.2.4)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
     uglifier (1.2.4)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)


@@ -154,8 +157,10 @@ PLATFORMS
 
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
 
 DEPENDENCIES
   SystemTimer (>= 1.1.3)

+  bigdecimal
+  browser

   coffee-rails (~> 3.2.1)
   coffee-rails (~> 3.2.1)

-  composite_primary_keys (>= 5.0.0)
+  composite_primary_keys (= 5.0.4)

   deadlock_retry (>= 1.2.0)
   dynamic_form
   htmlentities
   deadlock_retry (>= 1.2.0)
   dynamic_form
   htmlentities


@@ -165,12 +170,13 @@ DEPENDENCIES
   jquery-rails
   libxml-ruby (>= 2.0.5)
   memcached (>= 1.4.1)
   jquery-rails
   libxml-ruby (>= 2.0.5)
   memcached (>= 1.4.1)

-  oauth-plugin (>= 0.4.0.pre7)
+  minitest

   open_id_authentication (>= 1.1.0)
   open_id_authentication (>= 1.1.0)

+  openstreetmap-oauth-plugin (>= 0.4.0.1)

   paperclip (~> 2.0)
   pg
   paperclip (~> 2.0)
   pg

-  rails (= 3.2.3)
-  rails-i18n (>= 0.6.2)
+  rails (= 3.2.6)
+  rails-i18n (>= 0.6.3)

   redcarpet
   rinku (>= 1.2.2)
   sanitize
   redcarpet
   rinku (>= 1.2.2)
   sanitize