X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dc5fedb687d5af91d10c331eb82db59530e89743..38c17fdee886e1beccba5a812ae4ad05a920ea98:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 686bca1ed..9f8447196 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -219,8 +219,8 @@ GEM hashie (4.1.0) html_tokenizer (0.0.7) htmlentities (4.3.4) - http_accept_language (2.0.5) - i18n (0.9.5) + http_accept_language (2.1.1) + i18n (1.8.3) concurrent-ruby (~> 1.0) i18n-js (3.7.0) i18n (>= 0.6.6) @@ -328,7 +328,8 @@ GEM progress (3.5.2) psych (3.1.0) public_suffix (4.0.5) - puma (3.12.6) + puma (4.3.5) + nio4r (~> 2.0) quad_tile (1.0.1) r2 (0.2.7) rack (2.2.3) @@ -364,9 +365,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - rails-i18n (4.0.2) - i18n (~> 0.6) - rails (>= 4.0) + rails-i18n (6.0.0) + i18n (>= 0.7, < 2) + railties (>= 6.0.0, < 7) railties (6.0.3.2) actionpack (= 6.0.3.2) activesupport (= 6.0.3.2) @@ -464,7 +465,7 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.3.0) + zeitwerk (2.3.1) PLATFORMS ruby @@ -500,7 +501,7 @@ DEPENDENCIES ffi-libarchive gd2-ffij (>= 0.4.0) htmlentities - http_accept_language (~> 2.0.0) + http_accept_language (~> 2.1.1) i18n-js (>= 3.0.0) image_optim_rails jbuilder (~> 2.7) @@ -526,14 +527,14 @@ DEPENDENCIES openstreetmap-deadlock_retry (>= 1.3.0) pg psych - puma (~> 3.11) + puma (~> 4.3) quad_tile (~> 1.0.1) r2 (~> 0.2.7) rack-cors rack-uri_sanitizer rails (= 6.0.3.2) rails-controller-testing - rails-i18n (~> 4.0.0) + rails-i18n (~> 6.0.0) rinku (>= 2.0.6) rotp rubocop