X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d3373754f0a2ad9a5868a8a79dd542ee8b53c132..01a506a254cf53700c201d40b4287e5aae02af2c:/Gemfile.lock?ds=inline diff --git a/Gemfile.lock b/Gemfile.lock index 91c20bb73..cc2d7deaf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,60 +4,62 @@ GEM SystemTimer (1.2.3) aasm (5.0.6) concurrent-ruby (~> 1.0) - actioncable (6.0.1) - actionpack (= 6.0.1) + actioncable (6.0.2) + actionpack (= 6.0.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.1) - actionpack (= 6.0.1) - activejob (= 6.0.1) - activerecord (= 6.0.1) - activestorage (= 6.0.1) - activesupport (= 6.0.1) + actionmailbox (6.0.2) + actionpack (= 6.0.2) + activejob (= 6.0.2) + activerecord (= 6.0.2) + activestorage (= 6.0.2) + activesupport (= 6.0.2) mail (>= 2.7.1) - actionmailer (6.0.1) - actionpack (= 6.0.1) - actionview (= 6.0.1) - activejob (= 6.0.1) + actionmailer (6.0.2) + actionpack (= 6.0.2) + actionview (= 6.0.2) + activejob (= 6.0.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.1) - actionview (= 6.0.1) - activesupport (= 6.0.1) + actionpack (6.0.2) + actionview (= 6.0.2) + activesupport (= 6.0.2) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.1) - actionpack (= 6.0.1) - activerecord (= 6.0.1) - activestorage (= 6.0.1) - activesupport (= 6.0.1) + actionpack-page_caching (1.2.0) + actionpack (>= 5.0.0) + actiontext (6.0.2) + actionpack (= 6.0.2) + activerecord (= 6.0.2) + activestorage (= 6.0.2) + activesupport (= 6.0.2) nokogiri (>= 1.8.5) - actionview (6.0.1) - activesupport (= 6.0.1) + actionview (6.0.2) + activesupport (= 6.0.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) active_record_union (1.3.0) activerecord (>= 4.0) - activejob (6.0.1) - activesupport (= 6.0.1) + activejob (6.0.2) + activesupport (= 6.0.2) globalid (>= 0.3.6) - activemodel (6.0.1) - activesupport (= 6.0.1) - activerecord (6.0.1) - activemodel (= 6.0.1) - activesupport (= 6.0.1) + activemodel (6.0.2) + activesupport (= 6.0.2) + activerecord (6.0.2) + activemodel (= 6.0.2) + activesupport (= 6.0.2) activerecord-import (1.0.3) activerecord (>= 3.2) - activestorage (6.0.1) - actionpack (= 6.0.1) - activejob (= 6.0.1) - activerecord (= 6.0.1) + activestorage (6.0.2) + actionpack (= 6.0.2) + activejob (= 6.0.2) + activerecord (= 6.0.2) marcel (~> 0.3.1) - activesupport (6.0.1) + activesupport (6.0.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -72,13 +74,13 @@ GEM autoprefixer-rails (9.7.3) execjs aws-eventstream (1.0.3) - aws-partitions (1.251.0) - aws-sdk-core (3.84.0) + aws-partitions (1.254.0) + aws-sdk-core (3.85.1) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.26.0) + aws-sdk-kms (1.27.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.59.0) @@ -104,8 +106,12 @@ GEM debug_inspector (>= 0.0.1) bootsnap (1.4.5) msgpack (~> 1.0) + bootstrap (4.3.1) + autoprefixer-rails (>= 9.1.0) + popper_js (>= 1.14.3, < 2) + sassc-rails (>= 2.0.0) browser (2.7.1) - builder (3.2.3) + builder (3.2.4) bzip2-ffi (1.0.0) ffi (~> 1.0) cancancan (3.0.1) @@ -234,7 +240,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.2.0) + json (2.3.0) jwt (2.2.1) kgio (2.11.2) kramdown (2.1.0) @@ -308,8 +314,6 @@ GEM omniauth-windowslive (0.0.12) multi_json (~> 1.12) omniauth-oauth2 (~> 1.4) - openstreetmap-actionpack-page_caching (1.1.2) - actionpack (>= 5.0.0) openstreetmap-deadlock_retry (1.3.0) parallel (1.19.1) parser (2.6.5.0) @@ -319,6 +323,7 @@ GEM capybara (>= 2.1, < 4) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) + popper_js (1.14.5) progress (3.5.2) psych (3.1.0) public_suffix (4.0.1) @@ -334,20 +339,20 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rack-uri_sanitizer (0.0.2) - rails (6.0.1) - actioncable (= 6.0.1) - actionmailbox (= 6.0.1) - actionmailer (= 6.0.1) - actionpack (= 6.0.1) - actiontext (= 6.0.1) - actionview (= 6.0.1) - activejob (= 6.0.1) - activemodel (= 6.0.1) - activerecord (= 6.0.1) - activestorage (= 6.0.1) - activesupport (= 6.0.1) + rails (6.0.2) + actioncable (= 6.0.2) + actionmailbox (= 6.0.2) + actionmailer (= 6.0.2) + actionpack (= 6.0.2) + actiontext (= 6.0.2) + actionview (= 6.0.2) + activejob (= 6.0.2) + activemodel (= 6.0.2) + activerecord (= 6.0.2) + activestorage (= 6.0.2) + activesupport (= 6.0.2) bundler (>= 1.3.0) - railties (= 6.0.1) + railties (= 6.0.2) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.4) actionpack (>= 5.0.1.x) @@ -361,9 +366,9 @@ GEM rails-i18n (4.0.2) i18n (~> 0.6) rails (>= 4.0) - railties (6.0.1) - actionpack (= 6.0.1) - activesupport (= 6.0.1) + railties (6.0.2) + actionpack (= 6.0.2) + activesupport (= 6.0.2) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -456,6 +461,7 @@ PLATFORMS DEPENDENCIES SystemTimer (>= 1.1.3) aasm + actionpack-page_caching (>= 1.2.0) active_record_union activerecord-import annotate @@ -465,6 +471,7 @@ DEPENDENCIES bigdecimal (~> 1.1.0) binding_of_caller bootsnap (>= 1.4.2) + bootstrap (~> 4.3.1) browser bzip2-ffi cancancan @@ -506,7 +513,6 @@ DEPENDENCIES omniauth-mediawiki (>= 0.0.4) omniauth-openid omniauth-windowslive - openstreetmap-actionpack-page_caching (>= 1.1.2) openstreetmap-deadlock_retry (>= 1.3.0) pg poltergeist @@ -516,7 +522,7 @@ DEPENDENCIES r2 (~> 0.2.7) rack-cors rack-uri_sanitizer - rails (= 6.0.1) + rails (= 6.0.2) rails-controller-testing rails-i18n (~> 4.0.0) rinku (>= 2.0.6)