X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/cc4bca22b02043087ebdd39f149ef88013f8f498..9326c7e402c88ed4bbfef64b6ad518b67427b674:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 33bca9420..439862353 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,7 +57,7 @@ GEM http_accept_language (2.0.0) httpauth (0.2.0) httpclient (2.3.4.1) - i18n (0.6.8) + i18n (0.6.9) iconv (0.1) jquery-rails (3.0.4) railties (>= 3.0, < 5.0) @@ -81,7 +81,7 @@ GEM multi_json (1.8.2) multi_xml (0.5.5) multipart-post (1.2.0) - nokogiri (1.6.0) + nokogiri (1.6.1) mini_portile (~> 0.5.0) oauth (0.4.7) oauth-plugin (0.5.1) @@ -98,14 +98,14 @@ GEM rack (~> 1.2) open_id_authentication (1.2.0) rack-openid (~> 1.3) - openstreetmap-i18n-js (3.0.0.rc5.2) + openstreetmap-i18n-js (3.0.0.rc5.3) i18n paperclip (3.5.2) activemodel (>= 3.0.0) activesupport (>= 3.0.0) cocaine (~> 0.5.3) mime-types - pg (0.17.0) + pg (0.17.1) polyglot (0.3.3) psych (2.0.2) r2 (0.2.2) @@ -124,9 +124,9 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 4.0.2) sprockets-rails (~> 2.0.0) - rails-i18n (4.0.0) + rails-i18n (4.0.1) i18n (~> 0.6) - rails (~> 4.0.0) + rails (~> 4.0) railties (4.0.2) actionpack (= 4.0.2) activesupport (= 4.0.2) @@ -161,7 +161,7 @@ GEM polyglot polyglot (>= 0.3.1) tzinfo (0.3.38) - uglifier (2.3.2) + uglifier (2.3.3) execjs (>= 0.3.0) json (>= 1.8.0) validates_email_format_of (1.5.3) @@ -191,7 +191,7 @@ DEPENDENCIES minitest (~> 4.7.0) oauth-plugin (>= 0.5.1) open_id_authentication (>= 1.1.0) - openstreetmap-i18n-js (>= 3.0.0.rc5.2) + openstreetmap-i18n-js (>= 3.0.0.rc5.3) paperclip (~> 3.0) pg psych