diff --git a/Gemfile b/Gemfile index f2d9b9c..8ae5298 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby '2.6.1' gem 'rails', '~> 5.2.3' gem 'sqlite3' -gem 'puma', '~> 3.11' +gem 'puma', '~> 4.3' gem 'sass-rails', '~> 5.0' gem 'uglifier', '>= 1.3.0' gem 'coffee-rails', '~> 4.2' diff --git a/Gemfile.lock b/Gemfile.lock index b739c8b..3acca05 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -67,17 +67,11 @@ GEM rack-test (>= 0.6.3) regexp_parser (~> 1.2) xpath (~> 3.2) - carrierwave (1.3.1) - activemodel (>= 4.0.0) - activesupport (>= 4.0.0) - mime-types (>= 1.16) childprocess (1.0.1) rake (< 13.0) chromedriver-helper (2.1.1) archive-zip (~> 0.10) nokogiri (~> 1.8) - ckeditor (5.0.0) - orm_adapter (~> 0.5.0) coffee-rails (4.2.2) coffee-script (>= 2.2.0) railties (>= 4.0.0) @@ -119,11 +113,7 @@ GEM marcel (0.3.3) mimemagic (~> 0.3.2) method_source (0.9.2) - mime-types (3.2.2) - mime-types-data (~> 3.2015) - mime-types-data (3.2019.0331) mimemagic (0.3.3) - mini_magick (4.9.3) mini_mime (1.0.1) mini_portile2 (2.4.0) minitest (5.11.3) @@ -133,7 +123,8 @@ GEM mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) public_suffix (3.1.0) - puma (3.12.1) + puma (4.3.11) + nio4r (~> 2.0) rack (2.0.7) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -236,16 +227,13 @@ DEPENDENCIES bootstrap-sass (~> 3.3, >= 3.3.6) byebug capybara (>= 2.15) - carrierwave chromedriver-helper - ckeditor coffee-rails (~> 4.2) devise (~> 4.2) jbuilder (~> 2.5) jquery-rails listen (>= 3.0.5, < 3.2) - mini_magick - puma (~> 3.11) + puma (~> 4.3) rails (~> 5.2.3) sass-rails (~> 5.0) selenium-webdriver