X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/aa4205482a4af317ec26fc686793b57f02a6864a..02542c96f27787a17da677bd9fc0e3ef8bceeaf6:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 0dcb5ccff..9b6f5ca2a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,7 +40,7 @@ GEM coffee-script-source execjs coffee-script-source (1.2.0) - composite_primary_keys (5.0.1) + composite_primary_keys (5.0.2) activerecord (~> 3.2.0) deadlock_retry (1.2.0) dynamic_form (1.1.4) @@ -52,6 +52,7 @@ GEM multipart-post (~> 1.1) rack (~> 1.1) hike (1.2.1) + htmlentities (4.3.1) http_accept_language (1.0.2) httpclient (2.2.4) i18n (0.6.0) @@ -63,7 +64,7 @@ GEM json (1.6.5) libv8 (3.3.10.4) libxml-ruby (2.2.2) - mail (2.4.1) + mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -71,7 +72,7 @@ GEM mime-types (1.17.2) multi_json (1.1.0) multipart-post (1.1.5) - nokogiri (1.5.0) + nokogiri (1.5.2) oauth (0.4.5) oauth-plugin (0.4.0.rc2) multi_json @@ -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) @@ -142,7 +143,7 @@ GEM treetop (1.4.10) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.31) + tzinfo (0.3.32) uglifier (1.2.3) execjs (>= 0.3.0) multi_json (>= 1.0.2) @@ -157,6 +158,7 @@ DEPENDENCIES composite_primary_keys (>= 5.0.0) deadlock_retry (>= 1.2.0) dynamic_form + htmlentities http_accept_language (>= 1.0.2) httpclient iconv