Merge branch 'master' into notes

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 35b50a361d624e23fe539e24843b3e7cad7a1fcf..8fea3da8e6f6d5b9265d9486dda3076946355a24 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,81 +2,93 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)

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

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

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

       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)

-      journey (~> 1.0.1)
+      journey (~> 1.0.4)

       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)

-      sprockets (~> 2.1.3)
-    activemodel (3.2.6)
-      activesupport (= 3.2.6)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)

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

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

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

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

       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
     bigdecimal (1.1.0)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
     bigdecimal (1.1.0)

-    browser (0.1.4)
-    builder (3.0.0)
-    cocaine (0.2.1)
+    builder (3.0.4)
+    cocaine (0.4.2)

     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs

-    coffee-script-source (1.3.3)
-    composite_primary_keys (5.0.8)
-      activerecord (~> 3.2.0)
+    coffee-script-source (1.4.0)
+    composite_primary_keys (5.0.10)
+      activerecord (~> 3.2.0, >= 3.2.9)

     deadlock_retry (1.2.0)
     dynamic_form (1.1.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)
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)

-    faraday (0.8.1)
+    faraday (0.8.4)

       multipart-post (~> 1.1)
     hike (1.2.1)
     htmlentities (4.3.1)
     http_accept_language (1.0.2)
       multipart-post (~> 1.1)
     hike (1.2.1)
     htmlentities (4.3.1)
     http_accept_language (1.0.2)

-    httpauth (0.1)
-    httpclient (2.2.5)
-    i18n (0.6.0)
+    httpauth (0.2.0)
+    httpclient (2.3.0.1)
+    i18n (0.6.1)
+    i18n-js (3.0.0.rc3)
+      i18n

     iconv (0.1)
     journey (1.0.4)
     iconv (0.1)
     journey (1.0.4)

-    jquery-rails (2.0.2)
-      railties (>= 3.2.0, < 5.0)
+    jquery-rails (2.1.3)
+      railties (>= 3.1.0, < 5.0)

       thor (~> 0.14)
       thor (~> 0.14)

-    json (1.7.3)
-    jwt (0.1.4)
-      json (>= 1.2.4)
+    json (1.7.5)
+    jsonify (0.3.1)
+      multi_json (~> 1.0)
+    jsonify-rails (0.3.2)
+      actionpack
+      jsonify (< 0.4.0)
+    jwt (0.1.5)
+      multi_json (>= 1.0)

     libv8 (3.3.10.4)
     libxml-ruby (2.3.3)
     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.3)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)

-    memcached (1.4.2)
+    memcached (1.4.6)

     mime-types (1.19)
     mime-types (1.19)

-    minitest (3.2.0)
-    multi_json (1.3.6)
+    minitest (4.3.0)
+    multi_json (1.3.7)

     multipart-post (1.1.5)
     nokogiri (1.5.5)
     multipart-post (1.1.5)
     nokogiri (1.5.5)

-    oauth (0.4.6)
+    oauth (0.4.7)
+    oauth-plugin (0.4.1)
+      multi_json
+      oauth (~> 0.4.4)
+      oauth2 (>= 0.5.0)
+      rack

     oauth2 (0.8.0)
       faraday (~> 0.8)
       httpauth (~> 0.1)
     oauth2 (0.8.0)
       faraday (~> 0.8)
       httpauth (~> 0.1)


@@ -85,74 +97,73 @@ GEM
       rack (~> 1.2)
     open_id_authentication (1.1.0)
       rack-openid (~> 1.3)
       rack (~> 1.2)
     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)
+    paperclip (2.8.0)

       activerecord (>= 2.3.0)
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
       mime-types
       activerecord (>= 2.3.0)
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
       mime-types

-    pg (0.14.0)
+    pg (0.14.1)

     polyglot (0.3.3)
     polyglot (0.3.3)

+    r2 (0.0.3)

     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)

+    rack-cors (0.2.7)
+      rack

     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-ssl (1.3.2)
       rack
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-ssl (1.3.2)
       rack

-    rack-test (0.6.1)
+    rack-test (0.6.2)

       rack (>= 1.0)
       rack (>= 1.0)

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

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

-      railties (= 3.2.6)
-    rails-i18n (0.6.4)
+      railties (= 3.2.9)
+    rails-i18n (0.7.0)

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

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

       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)

-    rake (0.9.2.2)
+    rake (10.0.2)

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

-    redcarpet (2.1.1)
-    rinku (1.5.1)
-    ruby-openid (2.1.8)
+    redcarpet (2.2.2)
+    rinku (1.7.2)
+    ruby-openid (2.2.2)

     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)

-    sass (3.1.20)
+    sass (3.2.3)

     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.3)
+    sprockets (2.2.1)

       hike (~> 1.2)
       hike (~> 1.2)

+      multi_json (~> 1.0)

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

-    therubyracer (0.10.1)
+    therubyracer (0.10.2)

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

-    thor (0.15.4)
+    thor (0.16.0)

     tilt (1.3.3)
     tilt (1.3.3)

-    timecop (0.3.5)
-    treetop (1.4.10)
+    timecop (0.5.3)
+    treetop (1.4.12)

       polyglot
       polyglot (>= 0.3.1)
       polyglot
       polyglot (>= 0.3.1)

-    tzinfo (0.3.33)
-    uglifier (1.2.6)
+    tzinfo (0.3.35)
+    uglifier (1.3.0)

       execjs (>= 0.3.0)
       execjs (>= 0.3.0)

-      multi_json (~> 1.3)
+      multi_json (~> 1.0, >= 1.0.2)

     validates_email_format_of (1.5.3)
 
 PLATFORMS
     validates_email_format_of (1.5.3)
 
 PLATFORMS


@@ -161,27 +172,32 @@ PLATFORMS
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
   bigdecimal
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
   bigdecimal

-  browser

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

-  composite_primary_keys (>= 5.0.8)
+  composite_primary_keys (>= 5.0.10)

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

+  ejs

   htmlentities
   http_accept_language (>= 1.0.2)
   httpclient
   htmlentities
   http_accept_language (>= 1.0.2)
   httpclient

+  i18n-js (>= 3.0.0.rc2)

   iconv
   jquery-rails
   iconv
   jquery-rails

+  jsonify-rails

   libxml-ruby (>= 2.0.5)
   memcached (>= 1.4.1)
   minitest
   libxml-ruby (>= 2.0.5)
   memcached (>= 1.4.1)
   minitest

+  oauth-plugin (>= 0.4.1)

   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.6)
+  r2
+  rack-cors
+  rails (= 3.2.9)

   rails-i18n (>= 0.6.3)
   redcarpet
   rinku (>= 1.2.2)
   rails-i18n (>= 0.6.3)
   redcarpet
   rinku (>= 1.2.2)

+  ruby-openid (>= 2.2.0)

   sanitize
   sass-rails (~> 3.2.3)
   therubyracer
   sanitize
   sass-rails (~> 3.2.3)
   therubyracer