X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6aa8decccc389038bac04e411068e891394732d1..c2148e395d386175132e654b38b487ea6d937caf:/Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 4709cd195..0ea879021 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,34 +2,33 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    actionmailer (3.2.2)
-      actionpack (= 3.2.2)
-      mail (~> 2.4.0)
-    actionpack (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
+      mail (~> 2.4.4)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
       rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
-    activemodel (3.2.2)
-      activesupport (= 3.2.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-    activerecord (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
-    activesupport (3.2.2)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.7)
     arel (3.0.2)
     builder (3.0.0)
     cocaine (0.2.1)
@@ -39,50 +38,52 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.2.0)
-    composite_primary_keys (5.0.1)
+    coffee-script-source (1.3.1)
+    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.3.1)
       multi_json (~> 1.0)
-    faraday (0.7.6)
-      addressable (~> 2.2)
+    faraday (0.8.0)
       multipart-post (~> 1.1)
-      rack (~> 1.1)
     hike (1.2.1)
+    htmlentities (4.3.1)
     http_accept_language (1.0.2)
+    httpauth (0.1)
     httpclient (2.2.4)
     i18n (0.6.0)
     iconv (0.1)
     journey (1.0.3)
-    jquery-rails (2.0.1)
+    jquery-rails (2.0.2)
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
-    json (1.6.5)
+    json (1.7.0)
     libv8 (3.3.10.4)
-    libxml-ruby (2.2.2)
-    mail (2.4.1)
+    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)
-    mime-types (1.17.2)
-    multi_json (1.1.0)
+    mime-types (1.18)
+    multi_json (1.3.4)
     multipart-post (1.1.5)
-    nokogiri (1.5.0)
-    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.2)
+    oauth (0.4.6)
+    oauth2 (0.7.1)
+      faraday (~> 0.8)
+      httpauth (~> 0.1)
       multi_json (~> 1.0)
+      rack (~> 1.4)
     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)
@@ -91,7 +92,7 @@ GEM
     pg (0.13.2)
     polyglot (0.3.3)
     rack (1.4.1)
-    rack-cache (1.1)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
@@ -100,19 +101,19 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.2)
-      actionmailer (= 3.2.2)
-      actionpack (= 3.2.2)
-      activerecord (= 3.2.2)
-      activeresource (= 3.2.2)
-      activesupport (= 3.2.2)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
       bundler (~> 1.0)
-      railties (= 3.2.2)
-    rails-i18n (0.5.1)
+      railties (= 3.2.3)
+    rails-i18n (0.6.3)
       i18n (~> 0.5)
-    railties (3.2.2)
-      actionpack (= 3.2.2)
-      activesupport (= 3.2.2)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -120,20 +121,21 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
+    redcarpet (2.1.1)
     rinku (1.5.1)
     ruby-openid (2.1.8)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
-    sass (3.1.15)
-    sass-rails (3.2.4)
+    sass (3.1.16)
+    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)
-    therubyracer (0.9.10)
+    therubyracer (0.10.1)
       libv8 (~> 3.3.10)
     thor (0.14.6)
     tilt (1.3.3)
@@ -141,8 +143,8 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-    uglifier (1.2.3)
+    tzinfo (0.3.33)
+    uglifier (1.2.4)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
     validates_email_format_of (1.5.3)
@@ -156,18 +158,20 @@ DEPENDENCIES
   composite_primary_keys (>= 5.0.0)
   deadlock_retry (>= 1.2.0)
   dynamic_form
+  htmlentities
   http_accept_language (>= 1.0.2)
   httpclient
   iconv
   jquery-rails
   libxml-ruby (>= 2.0.5)
   memcached (>= 1.4.1)
-  oauth-plugin (>= 0.4.0.pre7)
   open_id_authentication (>= 1.1.0)
+  openstreetmap-oauth-plugin (>= 0.4.0.1)
   paperclip (~> 2.0)
   pg
-  rails (= 3.2.2)
-  rails-i18n (>= 0.5.1)
+  rails (= 3.2.3)
+  rails-i18n (>= 0.6.3)
+  redcarpet
   rinku (>= 1.2.2)
   sanitize
   sass-rails (~> 3.2.3)