Update bundle

diff --git a/Gemfile b/Gemfile
index f4ad7c7fa0166b0c2fac195125a9bf91b95e1152..11587ec3fee993914c8367003d83562067577e2e 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -9,6 +9,9 @@ gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19
 # Require things which have moved to gems in ruby 2.0
 gem 'psych', :platforms => :ruby_20
 
+# Require json for multi_json
+gem 'json'
+
 # Use postgres as the database
 gem 'pg'
 
@@ -45,7 +48,7 @@ gem 'openstreetmap-oauth-plugin', '>= 0.4.1.1', :require => 'oauth-plugin'
 gem 'open_id_authentication', '>= 1.1.0'
 gem 'validates_email_format_of', '>= 1.5.1'
 gem 'composite_primary_keys', '>= 6.0.0'
-gem 'http_accept_language', '>= 1.0.2'
+gem 'http_accept_language', '~> 1.0.2'
 gem 'paperclip', '~> 2.0'
 gem 'deadlock_retry', '>= 1.2.0'
 gem 'openstreetmap-i18n-js', '>= 3.0.0.rc5.2', :require => 'i18n-js'

diff --git a/Gemfile.lock b/Gemfile.lock
index ef7b44f0d43bf91c1400614949bc7bd2417a72ef..46d3e98ac88b5a5c10817087952180b858ef2dcd 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -29,7 +29,7 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     arel (4.0.0)
-    atomic (1.1.13)
+    atomic (1.1.14)
     bigdecimal (1.1.0)
     builder (3.1.4)
     climate_control (0.0.3)
@@ -49,8 +49,7 @@ GEM
     dynamic_form (1.1.4)
     ejs (1.1.1)
     erubis (2.7.0)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
+    execjs (2.0.1)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
     hike (1.2.3)
@@ -63,6 +62,7 @@ GEM
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
+    json (1.8.0)
     jsonify (0.3.1)
       multi_json (~> 1.0)
     jsonify-rails (0.3.2)
@@ -75,10 +75,10 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     memcached (1.7.0)
-    mime-types (1.24)
+    mime-types (1.25)
     mini_portile (0.5.1)
     minitest (4.7.5)
-    multi_json (1.7.9)
+    multi_json (1.8.0)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     nokogiri (1.6.0)
@@ -91,7 +91,7 @@ GEM
       multi_json (~> 1.0)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    open_id_authentication (1.1.0)
+    open_id_authentication (1.2.0)
       rack-openid (~> 1.3)
     openstreetmap-i18n-js (3.0.0.rc5.2)
       i18n
@@ -105,9 +105,9 @@ GEM
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
       mime-types
-    pg (0.16.0)
+    pg (0.17.0)
     polyglot (0.3.3)
-    psych (2.0.0)
+    psych (2.0.1)
     r2 (0.2.2)
     rack (1.5.2)
     rack-cors (0.2.8)
@@ -135,7 +135,7 @@ GEM
     rake (10.1.0)
     redcarpet (3.0.0)
     rinku (1.7.3)
-    ruby-openid (2.2.3)
+    ruby-openid (2.3.0)
     sanitize (2.0.6)
       nokogiri (>= 1.4.4)
     sass (3.2.10)
@@ -153,15 +153,15 @@ GEM
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     thor (0.18.1)
-    thread_safe (0.1.2)
+    thread_safe (0.1.3)
       atomic
     tilt (1.4.1)
     timecop (0.6.3)
-    treetop (1.4.14)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
-    uglifier (2.1.2)
+    uglifier (2.2.1)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
     validates_email_format_of (1.5.3)
@@ -180,10 +180,11 @@ DEPENDENCIES
   dynamic_form
   ejs
   htmlentities
-  http_accept_language (>= 1.0.2)
+  http_accept_language (~> 1.0.2)
   httpclient
   iconv (= 0.1)
   jquery-rails
+  json
   jsonify-rails
   libxml-ruby (>= 2.0.5)
   memcached (>= 1.4.1)