diff --git a/Gemfile.lock b/Gemfile.lock index 4239de80..6f336be5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,7 +12,7 @@ PATH fae-rails (2.1.0) acts_as_list (~> 0.9.11) browser (~> 2.5.3) - carrierwave (~> 1.2.2) + carrierwave (>= 1.2.2, < 2.2.0) devise (~> 4.7.1) jquery-rails (~> 4.3.1) jquery-ui-rails (~> 6.0.1) @@ -83,7 +83,7 @@ GEM rake thor (>= 0.14.0) arel (9.0.0) - bcrypt (3.1.13) + bcrypt (3.1.16) better_errors (2.5.1) coderay (>= 1.0.0) erubi (>= 1.0.0) @@ -115,18 +115,22 @@ GEM capybara-webkit (1.11.1) capybara (>= 2.3.0, < 2.8.0) json - carrierwave (1.2.3) - 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) childprocess (3.0.0) coderay (1.1.2) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.8) crass (1.0.6) daemons (1.3.1) database_cleaner (1.7.0) debug_inspector (0.0.3) - devise (4.7.1) + devise (4.7.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) @@ -159,8 +163,11 @@ GEM guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - i18n (1.8.2) + i18n (1.8.8) concurrent-ruby (~> 1.0) + image_processing (1.12.1) + mini_magick (>= 4.9.5, < 5) + ruby-vips (>= 2.0.17, < 3) jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) @@ -201,12 +208,12 @@ GEM method_source (0.9.2) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2019.1009) + mime-types-data (3.2020.1104) mimemagic (0.3.3) - mini_magick (4.10.1) + mini_magick (4.11.0) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.14.0) + minitest (5.14.3) multi_json (1.14.1) mysql2 (0.5.3) nenv (0.3.0) @@ -261,7 +268,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) remotipart (1.4.4) - responders (3.0.0) + responders (3.0.1) actionpack (>= 5.0) railties (>= 5.0) rspec (3.6.0) @@ -286,6 +293,8 @@ GEM rspec-support (~> 3.6.0) rspec-support (3.6.0) ruby-prof (1.1.0) + ruby-vips (2.0.17) + ffi (~> 1.9) rubyzip (1.3.0) sass (3.7.4) sass-listen (~> 4.0.0) @@ -294,7 +303,7 @@ GEM rb-inotify (~> 0.9, >= 0.9.7) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) - sassc (2.2.1) + sassc (2.4.0) ffi (~> 1.9) sassc-rails (2.1.2) railties (>= 4.0.0) @@ -310,10 +319,10 @@ GEM shellany (0.0.1) shoulda-matchers (4.2.0) activesupport (>= 4.2.0) - simple_form (5.0.1) + simple_form (5.0.3) actionpack (>= 5.0) activemodel (>= 5.0) - slim (4.0.1) + slim (4.1.0) temple (>= 0.7.6, < 0.9) tilt (>= 2.0.6, < 2.1) sprockets (4.0.0) @@ -326,6 +335,7 @@ GEM sshkit (1.20.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) + ssrf_filter (1.0.7) temple (0.8.2) thin (1.7.2) daemons (~> 1.0, >= 1.0.9) @@ -334,12 +344,12 @@ GEM thor (1.0.1) thread_safe (0.3.6) tilt (2.0.10) - tzinfo (1.2.6) + tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - warden (1.2.8) - rack (>= 2.0.6) + warden (1.2.9) + rack (>= 2.0.9) websocket (1.0.7) websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) diff --git a/cymes.gemspec b/cymes.gemspec index ed3feb89..c5d6e782 100644 --- a/cymes.gemspec +++ b/cymes.gemspec @@ -24,7 +24,7 @@ Gem::Specification.new do |s| # other dependencies s.add_dependency 'acts_as_list', '~> 0.9.11' s.add_dependency 'browser', '~> 2.5.3' - s.add_dependency 'carrierwave', '~> 1.2.2' + s.add_dependency 'carrierwave', '>= 1.2.2', '< 2.2.0' s.add_dependency 'devise', '~> 4.7.1' s.add_dependency 'jquery-ui-rails', '~> 6.0.1' s.add_dependency 'mini_magick'