X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/169a29a5d7c4352f2742d6e1257af6b78bc90b20..888a0be7902750d9af2e5fb87812f9c8a40cf1b7:/Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 4af9e5068..10a28c821 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,46 +1,37 @@
-GIT
-  remote: git://github.com/tomhughes/oauth-plugin.git
-  revision: 57e80661fcb0d0a24c1f51651b1e43623b1f9a65
-  branch: openstreetmap
-  specs:
-    oauth-plugin (0.4.0.1)
-      multi_json
-      oauth (~> 0.4.4)
-      oauth2 (>= 0.5.0)
-      rack
-
 GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    actionmailer (3.2.3)
-      actionpack (= 3.2.3)
+    actionmailer (3.2.7)
+      actionpack (= 3.2.7)
       mail (~> 2.4.4)
-    actionpack (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    actionpack (3.2.7)
+      activemodel (= 3.2.7)
+      activesupport (= 3.2.7)
       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)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.7)
+      activesupport (= 3.2.7)
       builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    activerecord (3.2.7)
+      activemodel (= 3.2.7)
+      activesupport (= 3.2.7)
       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.7)
+      activemodel (= 3.2.7)
+      activesupport (= 3.2.7)
+    activesupport (3.2.7)
       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)
     coffee-rails (3.2.2)
@@ -49,45 +40,54 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.3.1)
-    composite_primary_keys (5.0.4)
+    coffee-script-source (1.3.3)
+    composite_primary_keys (5.0.8)
       activerecord (~> 3.2.0)
     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
     erubis (2.7.0)
-    execjs (1.3.1)
+    execjs (1.4.0)
       multi_json (~> 1.0)
-    faraday (0.8.0)
+    faraday (0.8.1)
       multipart-post (~> 1.1)
     hike (1.2.1)
     htmlentities (4.3.1)
     http_accept_language (1.0.2)
     httpauth (0.1)
-    httpclient (2.2.4)
+    httpclient (2.2.5)
     i18n (0.6.0)
     iconv (0.1)
-    journey (1.0.3)
+    journey (1.0.4)
     jquery-rails (2.0.2)
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
-    json (1.7.0)
+    json (1.7.4)
+    jwt (0.1.5)
+      multi_json (>= 1.0)
     libv8 (3.3.10.4)
-    libxml-ruby (2.3.2)
+    libxml-ruby (2.3.3)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    memcached (1.4.1)
-    mime-types (1.18)
-    multi_json (1.3.4)
+    memcached (1.4.3)
+    mime-types (1.19)
+    minitest (3.3.0)
+    multi_json (1.3.6)
     multipart-post (1.1.5)
-    nokogiri (1.5.2)
+    nokogiri (1.5.5)
     oauth (0.4.6)
-    oauth2 (0.7.1)
+    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)
+      jwt (~> 0.1.4)
       multi_json (~> 1.0)
-      rack (~> 1.4)
+      rack (~> 1.2)
     open_id_authentication (1.1.0)
       rack-openid (~> 1.3)
     paperclip (2.7.0)
@@ -95,7 +95,7 @@ GEM
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
       mime-types
-    pg (0.13.2)
+    pg (0.14.0)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -107,32 +107,32 @@ GEM
       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.7)
+      actionmailer (= 3.2.7)
+      actionpack (= 3.2.7)
+      activerecord (= 3.2.7)
+      activeresource (= 3.2.7)
+      activesupport (= 3.2.7)
       bundler (~> 1.0)
-      railties (= 3.2.3)
-    rails-i18n (0.6.3)
+      railties (= 3.2.7)
+    rails-i18n (0.6.5)
       i18n (~> 0.5)
-    railties (3.2.3)
-      actionpack (= 3.2.3)
-      activesupport (= 3.2.3)
+    railties (3.2.7)
+      actionpack (= 3.2.7)
+      activesupport (= 3.2.7)
       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)
     redcarpet (2.1.1)
-    rinku (1.5.1)
-    ruby-openid (2.1.8)
+    rinku (1.7.0)
+    ruby-openid (2.2.0)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
-    sass (3.1.16)
+    sass (3.1.20)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
@@ -143,16 +143,16 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     therubyracer (0.10.1)
       libv8 (~> 3.3.10)
-    thor (0.14.6)
+    thor (0.15.4)
     tilt (1.3.3)
-    timecop (0.3.5)
+    timecop (0.4.1)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.33)
-    uglifier (1.2.4)
+    uglifier (1.2.6)
       execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
+      multi_json (~> 1.3)
     validates_email_format_of (1.5.3)
 
 PLATFORMS
@@ -160,8 +160,10 @@ PLATFORMS
 
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
+  bigdecimal
+  browser
   coffee-rails (~> 3.2.1)
-  composite_primary_keys (>= 5.0.0)
+  composite_primary_keys (>= 5.0.8)
   deadlock_retry (>= 1.2.0)
   dynamic_form
   htmlentities
@@ -171,14 +173,16 @@ DEPENDENCIES
   jquery-rails
   libxml-ruby (>= 2.0.5)
   memcached (>= 1.4.1)
-  oauth-plugin (>= 0.4.0.1)!
+  minitest
+  oauth-plugin (>= 0.4.1)
   open_id_authentication (>= 1.1.0)
   paperclip (~> 2.0)
   pg
-  rails (= 3.2.3)
+  rails (= 3.2.7)
   rails-i18n (>= 0.6.3)
   redcarpet
   rinku (>= 1.2.2)
+  ruby-openid (>= 2.2.0)
   sanitize
   sass-rails (~> 3.2.3)
   therubyracer