diff --git a/Gemfile b/Gemfile index 9eb449316c0d2..35d97e9bbdaa9 100644 --- a/Gemfile +++ b/Gemfile @@ -85,7 +85,7 @@ group :storage do gem "google-cloud-storage", "~> 1.11", require: false gem "azure-storage", require: false - gem "image_processing", "~> 1.2" + gem "image_processing", "~> 1.12" end # Action Mailbox diff --git a/Gemfile.lock b/Gemfile.lock index 85d38303f49e5..deb50d7ffa14c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -236,10 +236,10 @@ GEM faye-websocket (0.10.7) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) - ffi (1.11.1) - ffi (1.11.1-java) - ffi (1.11.1-x64-mingw32) - ffi (1.11.1-x86-mingw32) + ffi (1.15.5) + ffi (1.15.5-java) + ffi (1.15.5-x64-mingw32) + ffi (1.15.5-x86-mingw32) fugit (1.2.1) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.1) @@ -276,9 +276,9 @@ GEM httpclient (2.8.3) i18n (1.6.0) concurrent-ruby (~> 1.0) - image_processing (1.7.1) - mini_magick (~> 4.0) - ruby-vips (>= 2.0.13, < 3) + image_processing (1.12.2) + mini_magick (>= 4.9.5, < 5) + ruby-vips (>= 2.0.17, < 3) jaro_winkler (1.5.2) jaro_winkler (1.5.2-java) jdbc-mysql (5.1.46) @@ -308,8 +308,10 @@ GEM mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) - mimemagic (0.3.3) - mini_magick (4.9.2) + mimemagic (0.3.10) + nokogiri (~> 1) + rake + mini_magick (4.11.0) mini_mime (1.0.1) mini_portile2 (2.4.0) minitest (5.11.3) @@ -418,8 +420,8 @@ GEM rack (>= 2.0) rubocop (>= 0.70.0) ruby-progressbar (1.10.1) - ruby-vips (2.0.13) - ffi (~> 1.9) + ruby-vips (2.1.4) + ffi (~> 1.12) ruby_dep (1.5.0) rubyzip (1.2.3) rufus-scheduler (3.6.0) @@ -552,7 +554,7 @@ DEPENDENCIES delayed_job_active_record google-cloud-storage (~> 1.11) hiredis - image_processing (~> 1.2) + image_processing (~> 1.12) json (>= 2.0.0) kindlerb (~> 1.2.0) libxml-ruby