X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0f5ad1f3cc5d82efef93d2d17809145c5f68f233..bfe5b1ac77db63f3ea0c9519730c370edb41c30b:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index bbfb73c5a..e4448fddc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,7 +48,7 @@ GEM rake (>= 10.4, < 13.0) arel (8.0.0) ast (2.4.0) - autoprefixer-rails (8.0.0) + autoprefixer-rails (8.2.0) execjs bigdecimal (1.1.0) builder (3.2.3) @@ -63,8 +63,6 @@ GEM xpath (>= 2.0, < 4.0) climate_control (0.2.0) cliver (0.3.2) - cocaine (0.5.8) - climate_control (>= 0.0.3, < 1.0) coffee-rails (4.2.2) coffee-script (>= 2.2.0) railties (>= 4.0.0) @@ -87,7 +85,7 @@ GEM dalli (2.7.6) docile (1.1.5) dynamic_form (1.1.4) - erubi (1.7.0) + erubi (1.7.1) execjs (2.7.0) exifr (1.3.3) factory_bot (4.8.2) @@ -99,7 +97,7 @@ GEM multipart-post (>= 1.2, < 3) ffi (1.9.23) fspath (3.1.0) - geoip (1.6.3) + geoip (1.6.4) globalid (0.4.1) activesupport (>= 4.2.0) hashdiff (0.3.7) @@ -108,8 +106,8 @@ GEM http_accept_language (2.0.5) i18n (0.9.5) concurrent-ruby (~> 1.0) - i18n-js (3.0.4) - i18n (~> 0.6, >= 0.6.6) + i18n-js (3.0.5) + i18n (>= 0.6.6, < 2) image_optim (0.26.1) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) @@ -149,7 +147,7 @@ GEM activesupport (>= 4.0) logstash-event (~> 1.2.0) request_store - loofah (2.2.0) + loofah (2.2.2) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.0) @@ -165,7 +163,7 @@ GEM multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - nio4r (2.2.0) + nio4r (2.3.0) nokogiri (1.8.2) mini_portile2 (~> 2.3.0) nokogumbo (1.5.0) @@ -210,14 +208,14 @@ GEM multi_json (~> 1.12) omniauth-oauth2 (~> 1.4) openstreetmap-deadlock_retry (1.3.0) - paperclip (5.2.1) + paperclip (5.3.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) - cocaine (~> 0.5.5) mime-types mimemagic (~> 0.3.0) + terrapin (~> 0.6.0) parallel (1.12.1) - parser (2.5.0.2) + parser (2.5.0.5) ast (~> 2.4.0) pg (0.21.0) poltergeist (1.17.0) @@ -228,14 +226,14 @@ GEM progress (3.4.0) psych (3.0.2) public_suffix (3.0.2) - puma (3.11.2) + puma (3.11.3) r2 (0.2.7) rack (2.0.4) rack-cors (1.0.2) rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - rack-test (0.8.2) + rack-test (0.8.3) rack (>= 1.0, < 3) rack-uri_sanitizer (0.0.2) rails (5.1.5) @@ -257,8 +255,8 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) rails-i18n (4.0.2) i18n (~> 0.6) rails (>= 4.0) @@ -269,21 +267,21 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.0.0) - rake (12.3.0) - rb-fsevent (0.10.2) + rake (12.3.1) + rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) record_tag_helper (1.0.0) actionview (~> 5.x) redcarpet (3.4.0) ref (2.0.0) - request_store (1.4.0) + request_store (1.4.1) rack (>= 1.4) rinku (2.0.4) - rotp (3.3.0) - rubocop (0.52.1) + rotp (3.3.1) + rubocop (0.54.0) parallel (~> 1.10) - parser (>= 2.4.0.2, < 3.0) + parser (>= 2.5) powerpack (~> 0.1) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) @@ -292,11 +290,11 @@ GEM ruby-progressbar (1.9.0) ruby_dep (1.5.0) safe_yaml (1.0.4) - sanitize (4.6.0) + sanitize (4.6.4) crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4) - sass (3.5.5) + sass (3.5.6) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -323,6 +321,8 @@ GEM sprockets (>= 3.0.0) term-ansicolor (1.6.0) tins (~> 1.0) + terrapin (0.6.0) + climate_control (>= 0.0.3, < 1.0) therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref @@ -332,7 +332,7 @@ GEM tins (1.16.3) tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.6) + uglifier (4.1.8) execjs (>= 0.3.0, < 3) unicode-display_width (1.3.0) useragent (0.16.10)