X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/fe3eaafd3e4e3867147e73c75389dc4e82e64718..d101306d3be2d1dc75d78173c86085987db6f029:/Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index ed69bc8ad..f434a6a68 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,12 +2,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    actionmailer (3.2.5)
-      actionpack (= 3.2.5)
+    actionmailer (3.2.6)
+      actionpack (= 3.2.6)
       mail (~> 2.4.4)
-    actionpack (3.2.5)
-      activemodel (= 3.2.5)
-      activesupport (= 3.2.5)
+    actionpack (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
@@ -15,22 +15,23 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.3)
-    activemodel (3.2.5)
-      activesupport (= 3.2.5)
+    activemodel (3.2.6)
+      activesupport (= 3.2.6)
       builder (~> 3.0.0)
-    activerecord (3.2.5)
-      activemodel (= 3.2.5)
-      activesupport (= 3.2.5)
+    activerecord (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.5)
-      activemodel (= 3.2.5)
-      activesupport (= 3.2.5)
-    activesupport (3.2.5)
+    activeresource (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+    activesupport (3.2.6)
       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)
@@ -56,7 +57,7 @@ GEM
     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)
@@ -67,12 +68,12 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    memcached (1.4.1)
+    memcached (1.4.2)
     mime-types (1.18)
-    minitest (3.0.1)
+    minitest (3.1.0)
     multi_json (1.3.6)
     multipart-post (1.1.5)
-    nokogiri (1.5.3)
+    nokogiri (1.5.4)
     oauth (0.4.6)
     oauth2 (0.7.1)
       faraday (~> 0.8)
@@ -103,19 +104,19 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.5)
-      actionmailer (= 3.2.5)
-      actionpack (= 3.2.5)
-      activerecord (= 3.2.5)
-      activeresource (= 3.2.5)
-      activesupport (= 3.2.5)
+    rails (3.2.6)
+      actionmailer (= 3.2.6)
+      actionpack (= 3.2.6)
+      activerecord (= 3.2.6)
+      activeresource (= 3.2.6)
+      activesupport (= 3.2.6)
       bundler (~> 1.0)
-      railties (= 3.2.5)
+      railties (= 3.2.6)
     rails-i18n (0.6.4)
       i18n (~> 0.5)
-    railties (3.2.5)
-      actionpack (= 3.2.5)
-      activesupport (= 3.2.5)
+    railties (3.2.6)
+      actionpack (= 3.2.6)
+      activesupport (= 3.2.6)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -157,6 +158,7 @@ PLATFORMS
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
   bigdecimal
+  browser
   coffee-rails (~> 3.2.1)
   composite_primary_keys (= 5.0.4)
   deadlock_retry (>= 1.2.0)
@@ -173,7 +175,7 @@ DEPENDENCIES
   openstreetmap-oauth-plugin (>= 0.4.0.1)
   paperclip (~> 2.0)
   pg
-  rails (= 3.2.5)
+  rails (= 3.2.6)
   rails-i18n (>= 0.6.3)
   redcarpet
   rinku (>= 1.2.2)