diff --git a/Gemfile b/Gemfile old mode 100755 new mode 100644 index 9705c97..0d176d3 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ end gem 'rails', '~> 5.1.6' gem 'pg', '~> 0.20.0' -gem 'puma', '~> 3.7' +gem 'puma', '~> 4.3' gem 'sass-rails', '~> 5.0' gem 'uglifier', '>= 1.3.0' gem 'webpacker' diff --git a/Gemfile.lock b/Gemfile.lock index 3057bc2..6bbbf4d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -78,14 +78,10 @@ GEM connection_pool (2.2.2) crass (1.0.5) erubi (1.9.0) - erubis (2.7.0) execjs (2.7.0) ffi (1.11.1) globalid (0.4.2) activesupport (>= 4.2.0) - haml (5.1.2) - temple (>= 0.8.0) - tilt hamlit (2.10.0) temple (>= 0.8.2) thor @@ -95,11 +91,6 @@ GEM activesupport (>= 4.0.1) hamlit (>= 1.2.0) railties (>= 4.0.1) - html2haml (2.2.0) - erubis (~> 2.7.0) - haml (>= 4.0, < 6) - nokogiri (>= 1.6.0) - ruby_parser (~> 3.5) i18n (1.7.0) concurrent-ruby (~> 1.0) jbuilder (2.9.1) @@ -123,7 +114,7 @@ GEM kaminari (>= 0.13.0) rails kaminari-core (1.1.1) - libv8 (7.3.492.27.1-x86_64-linux) + libv8 (7.3.492.27.1) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -151,7 +142,8 @@ GEM byebug (~> 11.0) pry (~> 0.10) public_suffix (4.0.1) - puma (3.12.1) + puma (4.3.8) + nio4r (~> 2.0) rack (2.0.7) rack-proxy (0.6.5) rack @@ -195,8 +187,6 @@ GEM tilt redis (4.1.3) ruby_dep (1.5.0) - ruby_parser (3.14.1) - sexp_processor (~> 4.9) rubyzip (2.0.0) sass (3.7.4) sass-listen (~> 4.0.0) @@ -220,7 +210,6 @@ GEM selenium-webdriver (3.142.6) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - sexp_processor (4.13.0) spring (2.1.0) spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) @@ -269,7 +258,6 @@ DEPENDENCIES capybara (~> 2.13) coffee-rails (~> 4.2) hamlit-rails - html2haml jbuilder (~> 2.5) jquery-rails kaminari @@ -278,7 +266,7 @@ DEPENDENCIES mini_racer pg (~> 0.20.0) pry-byebug - puma (~> 3.7) + puma (~> 4.3) rails (~> 5.1.6) rails-i18n react-rails