Commit 90835cfa authored by mh's avatar mh
Browse files

fix puma issue really for chrome

parent e22fd31a
......@@ -8,14 +8,7 @@ gem 'rails', '~> 5.2.0'
# Use sqlite3 as the database for Active Record
gem 'sqlite3', '~> 1.3', '< 1.4'
# Use Puma as the app server
# TODO remove once released
# https://github.com/puma/puma/issues/1670
# https://github.com/puma/puma/issues/1758
if ENV['PUMA_SSL_FIX'].to_i == 1
gem 'puma', git: 'https://github.com/puma/puma', ref: '27a09c4e7c0e04bc25a515388b6b8a55fa332ad5'
else
gem 'puma', '~> 3.11'
end
gem 'puma', '~> 4.0'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
......
......@@ -130,7 +130,8 @@ GEM
parser (2.6.3.0)
ast (~> 2.4.0)
public_suffix (3.0.3)
puma (3.12.1)
puma (4.0.1)
nio4r (~> 2.0)
rack (2.0.7)
rack-test (1.1.0)
rack (>= 1.0, < 3)
......@@ -243,7 +244,7 @@ DEPENDENCIES
i18n-tasks
jbuilder (~> 2.5)
listen (>= 3.0.5, < 3.2)
puma (~> 3.11)
puma (~> 4.0)
rails (~> 5.2.0)
rest-client
rotp
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment