X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a71b8af4d1bded364c0ba7f05c8dd851a4a19859..5868be1f7b8eb252812b6920a80341c589f291c6:/Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index fb3ac9cb9..1effb0b34 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -29,8 +29,8 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionpack-page_caching (1.2.3)
-      actionpack (>= 5.0.0)
+    actionpack-page_caching (1.2.4)
+      actionpack (>= 4.0.0)
     actiontext (6.1.3.2)
       actionpack (= 6.1.3.2)
       activerecord (= 6.1.3.2)
@@ -53,7 +53,7 @@ GEM
     activerecord (6.1.3.2)
       activemodel (= 6.1.3.2)
       activesupport (= 6.1.3.2)
-    activerecord-import (1.0.8)
+    activerecord-import (1.1.0)
       activerecord (>= 3.2)
     activestorage (6.1.3.2)
       actionpack (= 6.1.3.2)
@@ -74,10 +74,10 @@ GEM
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.2)
-    autoprefixer-rails (10.2.4.0)
-      execjs
+    autoprefixer-rails (10.2.5.0)
+      execjs (< 2.8.0)
     aws-eventstream (1.1.1)
-    aws-partitions (1.452.0)
+    aws-partitions (1.457.0)
     aws-sdk-core (3.114.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
@@ -150,7 +150,11 @@ GEM
     delayed_job_active_record (4.1.6)
       activerecord (>= 3.0, < 6.2)
       delayed_job (>= 3.0, < 5)
-    docile (1.3.5)
+    docile (1.4.0)
+    doorkeeper (5.5.1)
+      railties (>= 5)
+    doorkeeper-i18n (5.2.2)
+      doorkeeper (>= 5.2)
     dry-configurable (0.12.1)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5.0)
@@ -227,7 +231,7 @@ GEM
       concurrent-ruby (~> 1.0)
     i18n-js (3.8.2)
       i18n (>= 0.6.6)
-    image_optim (0.29.0)
+    image_optim (0.30.0)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       image_size (>= 1.5, < 3)
@@ -237,6 +241,9 @@ GEM
       image_optim (~> 0.24)
       rails
       sprockets
+    image_processing (1.12.1)
+      mini_magick (>= 4.9.5, < 5)
+      ruby-vips (>= 2.0.17, < 3)
     image_size (2.1.0)
     in_threads (1.5.4)
     jbuilder (2.11.2)
@@ -275,7 +282,7 @@ GEM
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nio4r (2.5.7)
-    nokogiri (1.11.3)
+    nokogiri (1.11.4)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     nokogumbo (2.0.5)
@@ -332,7 +339,7 @@ GEM
     popper_js (1.16.0)
     progress (3.6.0)
     public_suffix (4.0.6)
-    puma (5.3.0)
+    puma (5.3.1)
       nio4r (~> 2.0)
     quad_tile (1.0.1)
     r2 (0.2.7)
@@ -392,7 +399,7 @@ GEM
     rexml (3.2.5)
     rinku (2.0.6)
     rotp (6.2.0)
-    rubocop (1.14.0)
+    rubocop (1.15.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -416,6 +423,8 @@ GEM
       rubocop
     ruby-openid (2.9.2)
     ruby-progressbar (1.11.0)
+    ruby-vips (2.1.2)
+      ffi (~> 1.12)
     ruby2_keywords (0.0.4)
     rubyzip (2.3.0)
     sanitize (5.2.3)
@@ -461,7 +470,7 @@ GEM
     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.2.0)
-    webmock (3.12.2)
+    webmock (3.13.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -499,6 +508,8 @@ DEPENDENCIES
   dalli
   debug_inspector
   delayed_job_active_record
+  doorkeeper
+  doorkeeper-i18n
   erb_lint
   factory_bot_rails
   faraday
@@ -508,6 +519,7 @@ DEPENDENCIES
   http_accept_language (~> 2.1.1)
   i18n-js (>= 3.0.0)
   image_optim_rails
+  image_processing
   jbuilder (~> 2.7)
   jquery-rails
   json
@@ -518,7 +530,6 @@ DEPENDENCIES
   logstasher
   marcel
   maxminddb
-  mini_magick
   minitest (~> 5.1)
   oauth-plugin (>= 0.5.1)
   omniauth (~> 2.0.2)
@@ -531,7 +542,7 @@ DEPENDENCIES
   omniauth-windowslive
   openstreetmap-deadlock_retry (>= 1.3.1)
   pg
-  puma (~> 5.0)
+  puma (~> 5.3)
   quad_tile (~> 1.0.1)
   r2 (~> 0.2.7)
   rack-cors