diff --git a/Gemfile b/Gemfile index a19c9b1..5da560c 100644 --- a/Gemfile +++ b/Gemfile @@ -65,7 +65,7 @@ gem "pundit" #gem 'carrierwave' -gem 'carrierwave', '>= 1.0.0.rc', '< 2.0' +gem 'carrierwave', '>= 1.0.0.rc', '< 3.0' gem "mini_magick" #gem 'remotipart', '~> 1.2' diff --git a/Gemfile.lock b/Gemfile.lock index 8988567..7ea0da6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,6 +49,8 @@ GEM i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) arel (7.1.4) autoprefixer-rails (6.5.2) execjs @@ -58,10 +60,14 @@ GEM sass (>= 3.4.19) builder (3.2.2) byebug (9.0.6) - carrierwave (1.0.0.rc) - activemodel (>= 4.0.0) - activesupport (>= 4.0.0) - mime-types (>= 1.16) + carrierwave (2.1.1) + activemodel (>= 5.0.0) + activesupport (>= 5.0.0) + addressable (~> 2.6) + image_processing (~> 1.1) + mimemagic (>= 0.3.0) + mini_mime (>= 0.1.3) + ssrf_filter (~> 1.0) coffee-rails (4.2.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.2.x) @@ -69,7 +75,7 @@ GEM coffee-script-source execjs coffee-script-source (1.10.0) - concurrent-ruby (1.0.2) + concurrent-ruby (1.1.8) countries (2.0.8) i18n_data (~> 0.7.0) money (~> 6.7) @@ -93,8 +99,11 @@ GEM railties (>= 3.2, < 5.1) globalid (0.3.7) activesupport (>= 4.1.0) - i18n (0.7.0) + i18n (0.8.6) i18n_data (0.7.0) + image_processing (1.7.1) + mini_magick (~> 4.0) + ruby-vips (>= 2.0.13, < 3) jbuilder (2.6.0) activesupport (>= 3.0.0, < 5.1) multi_json (~> 1.2) @@ -112,12 +121,14 @@ GEM mail (2.6.4) mime-types (>= 1.16, < 4) method_source (0.8.2) - mime-types (3.1) + mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mime-types-data (3.2020.1104) + mimemagic (0.3.5) mini_magick (4.5.1) + mini_mime (1.0.2) mini_portile2 (2.1.0) - minitest (5.9.1) + minitest (5.14.3) money (6.9.0) i18n (>= 0.6.4, < 0.9) multi_json (1.12.1) @@ -125,6 +136,7 @@ GEM nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) orm_adapter (0.5.0) + public_suffix (4.0.6) puma (3.6.0) pundit (1.1.0) activesupport (>= 3.0.0) @@ -181,6 +193,8 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) + ruby-vips (2.0.17) + ffi (~> 1.9) sass (3.4.22) sass-rails (5.0.6) railties (>= 4.0.0, < 6) @@ -204,13 +218,14 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.12) + ssrf_filter (1.0.7) thor (0.19.1) - thread_safe (0.3.5) + thread_safe (0.3.6) tilt (2.0.5) turbolinks (5.0.1) turbolinks-source (~> 5) turbolinks-source (5.0.0) - tzinfo (1.2.2) + tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (3.0.3) execjs (>= 0.3.0, < 3) @@ -233,7 +248,7 @@ DEPENDENCIES aasm bootstrap (~> 4.0.0.alpha5) byebug - carrierwave (>= 1.0.0.rc, < 2.0) + carrierwave (>= 1.0.0.rc, < 3.0) coffee-rails (~> 4.2) country_select devise