X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3e7bc943fe03dcd74666b6f26b3a831e06cac1d8..b7834aa827abb2cb7aff4ce3c6c05ced42820b67:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 36e6ae9dd..0dd07a95e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,7 +49,7 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) annotate (2.7.4) activerecord (>= 3.2, < 6.0) @@ -58,19 +58,20 @@ GEM ast (2.4.0) autoprefixer-rails (8.6.5) execjs - better_errors (2.5.0) + better_errors (2.5.1) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) bigdecimal (1.1.0) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bootsnap (1.3.2) + bootsnap (1.4.0) msgpack (~> 1.0) + browser (2.5.3) builder (3.2.3) cancancan (2.3.0) - canonical-rails (0.2.4) - rails (>= 4.1, < 5.3) + canonical-rails (0.2.5) + rails (>= 4.1, < 6.1) capybara (2.18.0) addressable mini_mime (>= 0.1.3) @@ -111,13 +112,13 @@ GEM dynamic_form (1.1.4) erubi (1.8.0) execjs (2.7.0) - exifr (1.3.5) - factory_bot (4.11.1) - activesupport (>= 3.0.0) - factory_bot_rails (4.11.1) - factory_bot (~> 4.11.1) - railties (>= 3.0.0) - fakefs (0.18.1) + exifr (1.3.6) + factory_bot (5.0.0) + activesupport (>= 4.2.0) + factory_bot_rails (5.0.1) + factory_bot (~> 5.0.0) + railties (>= 4.2.0) + fakefs (0.19.1) faraday (0.15.4) multipart-post (>= 1.2, < 3) ffi (1.9.25) @@ -125,7 +126,7 @@ GEM gd2-ffij (0.3.0) ffi (>= 1.0.0) geoip (1.6.4) - globalid (0.4.1) + globalid (0.4.2) activesupport (>= 4.2.0) hashdiff (0.3.8) hashie (3.6.0) @@ -133,8 +134,8 @@ GEM http_accept_language (2.0.5) i18n (0.9.5) concurrent-ruby (~> 1.0) - i18n-js (3.2.0) - i18n (>= 0.8.0, < 2) + i18n-js (3.2.1) + i18n (>= 0.6.6) image_optim (0.26.3) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) @@ -164,7 +165,7 @@ GEM jsonify (< 0.4.0) jwt (2.1.0) kgio (2.11.2) - kramdown (1.17.0) + kramdown (2.1.0) libv8 (3.16.14.19) libxml-ruby (3.1.0) listen (3.1.5) @@ -196,7 +197,7 @@ GEM multi_xml (0.6.0) multipart-post (2.0.0) nio4r (2.3.1) - nokogiri (1.10.0) + nokogiri (1.10.1) mini_portile2 (~> 2.4.0) nokogumbo (2.0.1) nokogiri (~> 1.8, >= 1.8.4) @@ -246,8 +247,8 @@ GEM mime-types mimemagic (~> 0.3.0) terrapin (~> 0.6.0) - parallel (1.12.1) - parser (2.5.3.0) + parallel (1.13.0) + parser (2.6.0.0) ast (~> 2.4.0) pg (0.21.0) poltergeist (1.18.1) @@ -313,7 +314,7 @@ GEM rinku (2.0.4) rotp (4.0.2) addressable (~> 2.5) - rubocop (0.62.0) + rubocop (0.64.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) @@ -351,7 +352,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - term-ansicolor (1.7.0) + term-ansicolor (1.7.1) tins (~> 1.0) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) @@ -394,6 +395,7 @@ DEPENDENCIES bigdecimal (~> 1.1.0) binding_of_caller bootsnap (>= 1.1.0) + browser cancancan canonical-rails capybara (~> 2.13) @@ -444,7 +446,7 @@ DEPENDENCIES rails-controller-testing rails-i18n (~> 4.0.0) record_tag_helper - rinku (>= 1.2.2) + rinku (= 2.0.4) rotp rubocop sanitize