diff --git a/Gemfile b/Gemfile index 3964661..e4a48b6 100644 --- a/Gemfile +++ b/Gemfile @@ -62,7 +62,7 @@ gem 'ckeditor', '~> 4.2' gem 'font-awesome-rails', '~> 4.7', '>= 4.7.0.2' gem 'kaminari', '~> 1.1', '>= 1.1.1' gem 'jquery-ui-rails', '~> 6.0', '>= 6.0.1' -gem 'carrierwave', '~> 1.2', '>= 1.2.2' +gem 'carrierwave', '~> 1.3' gem 'mini_magick', '~> 4.8' gem 'carrierwave-aws', '~> 1.3' gem 'dotenv-rails', '~> 2.2', '>= 2.2.1' diff --git a/Gemfile.lock b/Gemfile.lock index d2479c7..8ba57cb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -67,10 +67,11 @@ GEM buftok (0.2.0) builder (3.2.3) byebug (10.0.2) - carrierwave (1.2.3) + carrierwave (1.3.2) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) + ssrf_filter (~> 1.0) carrierwave-aws (1.3.0) aws-sdk-s3 (~> 1.0) carrierwave (>= 0.7, < 2.0) @@ -89,7 +90,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.8) crass (1.0.4) devise (4.5.0) bcrypt (~> 3.0) @@ -123,7 +124,7 @@ GEM domain_name (~> 0.5) http-form_data (2.1.1) http_parser.rb (0.6.0) - i18n (1.1.0) + i18n (1.8.8) concurrent-ruby (~> 1.0) jbuilder (2.7.0) activesupport (>= 4.2.0) @@ -159,13 +160,13 @@ GEM memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) method_source (0.9.0) - mime-types (3.2.2) + mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2018.0812) + mime-types-data (3.2020.1104) mini_magick (4.9.2) mini_mime (1.0.1) mini_portile2 (2.3.0) - minitest (5.11.3) + minitest (5.14.3) multi_json (1.13.1) multipart-post (2.0.0) naught (1.1.0) @@ -246,6 +247,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) + ssrf_filter (1.0.7) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) thor (0.20.0) @@ -265,7 +267,7 @@ GEM multipart-post (~> 2.0) naught (~> 1.0) simple_oauth (~> 0.3.0) - tzinfo (1.2.5) + tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (4.1.19) execjs (>= 0.3.0, < 3) @@ -289,7 +291,7 @@ PLATFORMS DEPENDENCIES bootstrap (~> 4.0.0) byebug - carrierwave (~> 1.2, >= 1.2.2) + carrierwave (~> 1.3) carrierwave-aws (~> 1.3) ckeditor (~> 4.2) cocoon (~> 1.2, >= 1.2.9) @@ -305,8 +307,8 @@ DEPENDENCIES kaminari (~> 1.1, >= 1.1.1) listen (>= 3.0.5, < 3.2) mini_magick (~> 4.8) - pg (~> 0.18) petergate (~> 1.8, >= 1.8.1) + pg (~> 0.18) platipus (~> 0.1.0) pry-byebug puma (~> 3.7)