Clean up

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 37129758dd601e4647f917ec51a847255a23401e..993b08aa7cccb919b5499c96d5c6f721303d2586 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,45 +2,48 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)

-    actionmailer (3.2.11)
-      actionpack (= 3.2.11)
+    actionmailer (3.2.12)
+      actionpack (= 3.2.12)

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

-    actionpack (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
+    actionpack (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)

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

-      rack (~> 1.4.0)
+      rack (~> 1.4.5)

       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)

-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)

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

-    activerecord (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
+    activerecord (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)

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

-    activeresource (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-    activesupport (3.2.11)
+    activeresource (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+    activesupport (3.2.12)

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

-    cocaine (0.4.2)
+    climate_control (0.0.3)
+      activesupport (>= 3.0)
+    cocaine (0.5.1)
+      climate_control (>= 0.0.3, < 1.0)

     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.4.0)
-    composite_primary_keys (5.0.10)
+    coffee-script-source (1.6.2)
+    composite_primary_keys (5.0.13)

       activerecord (~> 3.2.0, >= 3.2.9)
     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
       activerecord (~> 3.2.0, >= 3.2.9)
     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)


@@ -48,47 +51,56 @@ GEM
     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.4)
+    faraday (0.8.7)

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

-    hike (1.2.1)
+    hike (1.2.3)

     htmlentities (4.3.1)
     http_accept_language (1.0.2)
     httpauth (0.2.0)
     htmlentities (4.3.1)
     http_accept_language (1.0.2)
     httpauth (0.2.0)

-    httpclient (2.3.2)
-    i18n (0.6.1)
-    i18n-js (3.0.0.rc3)
+    httpclient (2.3.3)
+    i18n (0.6.4)
+    i18n-js (3.0.0.rc5)

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

-    jquery-rails (2.1.4)
+    jquery-rails (3.0.1)

       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)

-    json (1.7.6)
-    jwt (0.1.5)
-      multi_json (>= 1.0)
+    json (1.8.0)
+    jsonify (0.3.1)
+      multi_json (~> 1.0)
+    jsonify-rails (0.3.2)
+      actionpack
+      jsonify (< 0.4.0)
+    jwt (0.1.8)
+      multi_json (>= 1.5)

     libv8 (3.3.10.4)
     libv8 (3.3.10.4)

-    libxml-ruby (2.4.0)
+    libxml-ruby (2.6.0)

     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)

-    memcached (1.5.0)
-    mime-types (1.19)
-    minitest (4.4.0)
-    multi_json (1.5.0)
-    multipart-post (1.1.5)
-    nokogiri (1.5.6)
+    memcached (1.6.1)
+    mime-types (1.23)
+    mini_portile (0.5.0)
+    minitest (4.7.5)
+    multi_json (1.7.7)
+    multi_xml (0.5.4)
+    multipart-post (1.2.0)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)

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

-    oauth2 (0.8.0)
+    oauth2 (0.9.2)

       faraday (~> 0.8)
       faraday (~> 0.8)

-      httpauth (~> 0.1)
+      httpauth (~> 0.2)

       jwt (~> 0.1.4)
       multi_json (~> 1.0)
       jwt (~> 0.1.4)
       multi_json (~> 1.0)

+      multi_xml (~> 0.5)

       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)


@@ -97,48 +109,49 @@ GEM
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
       mime-types
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
       mime-types

-    pg (0.14.1)
+    pg (0.15.1)

     polyglot (0.3.3)
     polyglot (0.3.3)

-    r2 (0.0.3)
-    rack (1.4.3)
+    psych (2.0.0)
+    r2 (0.2.1)
+    rack (1.4.5)

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

-    rack-cors (0.2.7)
+    rack-cors (0.2.8)

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

-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)

       rack
     rack-test (0.6.2)
       rack (>= 1.0)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)

-    rails (3.2.11)
-      actionmailer (= 3.2.11)
-      actionpack (= 3.2.11)
-      activerecord (= 3.2.11)
-      activeresource (= 3.2.11)
-      activesupport (= 3.2.11)
+    rails (3.2.12)
+      actionmailer (= 3.2.12)
+      actionpack (= 3.2.12)
+      activerecord (= 3.2.12)
+      activeresource (= 3.2.12)
+      activesupport (= 3.2.12)

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

-      railties (= 3.2.11)
-    rails-i18n (0.7.2)
+      railties (= 3.2.12)
+    rails-i18n (0.7.3)

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

-    railties (3.2.11)
-      actionpack (= 3.2.11)
-      activesupport (= 3.2.11)
+    railties (3.2.12)
+      actionpack (= 3.2.12)
+      activesupport (= 3.2.12)

       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 (10.0.3)
-    rdoc (3.12)
+    rake (10.1.0)
+    rdoc (3.12.2)

       json (~> 1.4)
       json (~> 1.4)

-    redcarpet (2.2.2)
-    rinku (1.7.2)
-    ruby-openid (2.2.2)
-    sanitize (2.0.3)
-      nokogiri (>= 1.4.4, < 1.6)
-    sass (3.2.5)
-    sass-rails (3.2.5)
+    redcarpet (2.3.0)
+    rinku (1.7.3)
+    ruby-openid (2.2.3)
+    sanitize (2.0.4)
+      nokogiri (~> 1.6.0)
+    sass (3.2.9)
+    sass-rails (3.2.6)

       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)


@@ -149,24 +162,25 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     therubyracer (0.10.2)
       libv8 (~> 3.3.10)
       tilt (~> 1.1, != 1.3.0)
     therubyracer (0.10.2)
       libv8 (~> 3.3.10)

-    thor (0.16.0)
-    tilt (1.3.3)
-    timecop (0.5.7)
-    treetop (1.4.12)
+    thor (0.18.1)
+    tilt (1.4.1)
+    timecop (0.6.1)
+    treetop (1.4.14)

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

-    tzinfo (0.3.35)
-    uglifier (1.3.0)
+    tzinfo (0.3.37)
+    uglifier (2.1.1)

       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
     validates_email_format_of (1.5.3)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
     validates_email_format_of (1.5.3)

+    vendorer (0.1.14)

 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   SystemTimer (>= 1.1.3)

-  bigdecimal
+  bigdecimal (~> 1.1.0)

   coffee-rails (~> 3.2.1)
   composite_primary_keys (>= 5.0.10)
   deadlock_retry (>= 1.2.0)
   coffee-rails (~> 3.2.1)
   composite_primary_keys (>= 5.0.10)
   deadlock_retry (>= 1.2.0)


@@ -176,18 +190,20 @@ DEPENDENCIES
   http_accept_language (>= 1.0.2)
   httpclient
   i18n-js (>= 3.0.0.rc2)
   http_accept_language (>= 1.0.2)
   httpclient
   i18n-js (>= 3.0.0.rc2)

-  iconv
+  iconv (= 0.1)

   jquery-rails
   jquery-rails

+  jsonify-rails

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

-  minitest
+  minitest (~> 4.7.0)

   oauth-plugin (>= 0.4.1)
   open_id_authentication (>= 1.1.0)
   paperclip (~> 2.0)
   pg
   oauth-plugin (>= 0.4.1)
   open_id_authentication (>= 1.1.0)
   paperclip (~> 2.0)
   pg

+  psych

   r2
   rack-cors
   r2
   rack-cors

-  rails (= 3.2.11)
+  rails (= 3.2.12)

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


@@ -198,3 +214,4 @@ DEPENDENCIES
   timecop
   uglifier (>= 1.0.3)
   validates_email_format_of (>= 1.5.1)
   timecop
   uglifier (>= 1.0.3)
   validates_email_format_of (>= 1.5.1)

+  vendorer