From c7b9f008a6f7f417ed432e9506fdcb9611304969 Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Wed, 17 Oct 2018 09:14:08 -0500 Subject: [PATCH] Use `puma` instead of `thin` Puma has become the default and has some really nice integration points in Rails. Co-Authored-By: Dan Rice --- Gemfile | 2 +- Gemfile.lock | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index b5522b45..fc0d620e 100644 --- a/Gemfile +++ b/Gemfile @@ -33,7 +33,7 @@ gem "aasm", '~> 3.4.0' gem "htmlentities" gem "swf_fu" gem "rails_autolink" -gem 'thin' +gem 'puma', '~> 3.0' gem 'paperclip' # To use ActiveModel has_secure_password diff --git a/Gemfile.lock b/Gemfile.lock index a27f79af..61dd227d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -76,12 +76,10 @@ GEM coffee-script-source (1.12.2) concurrent-ruby (1.0.5) crass (1.0.4) - daemons (1.2.6) database_cleaner (1.7.0) diff-lcs (1.3) docile (1.3.1) erubis (2.7.0) - eventmachine (1.2.7) execjs (2.7.0) factory_bot (4.10.0) activesupport (>= 3.0.0) @@ -138,6 +136,7 @@ GEM parser (2.5.1.2) ast (~> 2.4.0) powerpack (0.1.2) + puma (3.12.0) rack (2.0.5) rack-dev-mark (0.7.7) rack (>= 1.1, < 2.1) @@ -237,10 +236,6 @@ GEM therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref - thin (1.7.2) - daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0, >= 1.0.4) - rack (>= 1, < 3) thor (0.20.0) thread_safe (0.3.6) tilt (2.0.8) @@ -285,6 +280,7 @@ DEPENDENCIES mocha mysql2 (~> 0.3.17) paperclip + puma (~> 3.0) rack-dev-mark rack-mini-profiler rails (~> 5.0.0) @@ -301,7 +297,6 @@ DEPENDENCIES sqlite3 swf_fu therubyracer - thin tolk (~> 2.0.0) uglifier (>= 1.3.0) will_paginate