X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/313b421f2f48353db4065ae56bcba9338e2826d6..3377879d396a8c0e9df87cb438e7aaf2d90e991b:/Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 7b98bde18..b77f65cf5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,49 +2,60 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    abstract (1.0.0)
-    actionmailer (3.0.10)
-      actionpack (= 3.0.10)
-      mail (~> 2.2.19)
-    actionpack (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-    activesupport (3.0.10)
+    actionmailer (3.1.0)
+      actionpack (= 3.1.0)
+      mail (~> 2.3.0)
+    actionpack (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.0.3)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.0)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
     addressable (2.2.6)
-    arel (2.0.10)
-    builder (2.1.2)
-    composite_primary_keys (3.1.10)
-      activerecord (>= 3.0.5, ~> 3.0.0)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
+    arel (2.2.1)
+    bcrypt-ruby (3.0.0)
+    builder (3.0.0)
+    coffee-rails (3.1.0)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.1.0.rc1)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.1.2)
+    composite_primary_keys (4.0.0)
+      activerecord (~> 3.1.0)
+    erubis (2.7.0)
+    execjs (1.2.4)
+      multi_json (~> 1.0)
     faraday (0.7.4)
       addressable (~> 2.2.6)
       multipart-post (~> 1.1.0)
       rack (< 2, >= 1.1.0)
+    hike (1.2.1)
     httpclient (2.2.1)
-    i18n (0.5.0)
+    i18n (0.6.0)
     libxml-ruby (2.2.2)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -61,49 +72,70 @@ GEM
     oauth2 (0.5.0)
       faraday (< 0.8, >= 0.6.1)
       multi_json (~> 1.0.0)
-    open_id_authentication (1.0.0)
+    open_id_authentication (1.1.0)
       rack-openid (~> 1.3)
     pg (0.11.0)
     polyglot (0.3.2)
-    rack (1.2.3)
-    rack-mount (0.6.14)
+    prototype-rails (3.1.0)
+      rails (~> 3.1)
+    rack (1.3.2)
+    rack-cache (1.0.3)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-test (0.5.7)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.0.10)
-      actionmailer (= 3.0.10)
-      actionpack (= 3.0.10)
-      activerecord (= 3.0.10)
-      activeresource (= 3.0.10)
-      activesupport (= 3.0.10)
+    rails (3.1.0)
+      actionmailer (= 3.1.0)
+      actionpack (= 3.1.0)
+      activerecord (= 3.1.0)
+      activeresource (= 3.1.0)
+      activesupport (= 3.1.0)
       bundler (~> 1.0)
-      railties (= 3.0.10)
+      railties (= 3.1.0)
     rails-i18n-updater (1.0.1)
       actionpack
       activesupport
       rails
-    railties (3.0.10)
-      actionpack (= 3.0.10)
-      activesupport (= 3.0.10)
+    railties (3.1.0)
+      actionpack (= 3.1.0)
+      activesupport (= 3.1.0)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.4)
+      thor (~> 0.14.6)
     rake (0.9.2)
     rdoc (3.9.4)
+    rinku (1.2.2)
     rmagick (2.13.1)
     ruby-openid (2.1.8)
     sanitize (2.0.3)
-      nokogiri (>= 1.4.4, < 1.6)
+      nokogiri (< 1.6, >= 1.4.4)
+    sass (3.1.7)
+    sass-rails (3.1.0)
+      actionpack (~> 3.1.0)
+      railties (~> 3.1.0)
+      sass (>= 3.1.4)
+    sprockets (2.0.0)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (!= 1.3.0, ~> 1.1)
     thor (0.14.6)
+    tilt (1.3.3)
     timecop (0.3.5)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.29)
-    validates_email_format_of (1.5.0)
+    uglifier (1.0.2)
+      execjs (>= 0.3.0)
+      multi_json (>= 1.0.2)
+    validates_email_format_of (1.5.1)
 
 PLATFORMS
   ruby
@@ -111,16 +143,21 @@ PLATFORMS
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
   arel (>= 2.0.9)
-  composite_primary_keys (= 3.1.10)
+  coffee-rails (~> 3.1.0)
+  composite_primary_keys (= 4.0.0)
   httpclient
   libxml-ruby (>= 2.0.5)
   oauth (>= 0.4.4)
   oauth-plugin (>= 0.4.0.pre4)
-  open_id_authentication (>= 1.0.0)
+  open_id_authentication (>= 1.1.0)
   pg
-  rails (= 3.0.10)
+  prototype-rails
+  rails (= 3.1.0)
   rails-i18n-updater
+  rinku (>= 1.2.2)
   rmagick
   sanitize
+  sass-rails (~> 3.1.0)
   timecop
-  validates_email_format_of (>= 1.4.5)
+  uglifier
+  validates_email_format_of (>= 1.5.1)