X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9e8cf3ea71da5550540cb620ef73001871462ad6..65b009ea320ad6a5034bca6c2ce250f043f7bf8d:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index fe70cbfc5..cc73ba00c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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,21 +124,21 @@ 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) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.1.0) + rake (10.1.1) redcarpet (3.0.0) rinku (1.7.3) ruby-openid (2.3.0) sanitize (2.0.6) nokogiri (>= 1.4.4) - sass (3.2.12) + sass (3.2.13) sass-rails (4.0.1) railties (>= 4.0.0, < 5.0) sass (>= 3.1.10) @@ -161,7 +161,7 @@ GEM polyglot polyglot (>= 0.3.1) tzinfo (0.3.38) - uglifier (2.3.2) + uglifier (2.4.0) 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