From 407baf0f1dea11dbfc844cfd20933645c5bf70bd Mon Sep 17 00:00:00 2001 From: jrgriffiniii <1443986+jrgriffiniii@users.noreply.github.com> Date: Tue, 12 Sep 2023 13:57:22 -0400 Subject: [PATCH] Ensures that the thin server is used for the dev environment Co-authored-by: Carolyn Cole Co-authored-by: Francis Kayiwa --- Gemfile | 10 ++++++---- Gemfile.lock | 8 ++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 17b9bea..1eb0f99 100644 --- a/Gemfile +++ b/Gemfile @@ -67,6 +67,8 @@ group :development do gem "capistrano-bundler" gem "capistrano-passenger" gem "capistrano-rails" + + gem "thin" end group :test do @@ -85,10 +87,10 @@ group :development, :test do gem "rails-controller-testing" gem "rspec-rails" end -gem 'net-ssh', '7.0.0.beta1' -gem 'net-smtp' -gem 'net-imap' -gem 'net-pop' +gem "net-imap" +gem "net-pop" +gem "net-smtp" +gem "net-ssh", "7.0.0.beta1" group :production do gem "ddtrace", require: "ddtrace/auto_instrument" gem "execjs" diff --git a/Gemfile.lock b/Gemfile.lock index c8f3807..125fb2d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -125,6 +125,7 @@ GEM coffee-script-source (1.12.2) concurrent-ruby (1.1.10) crass (1.0.6) + daemons (1.4.1) database_cleaner-active_record (2.0.1) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) @@ -162,6 +163,7 @@ GEM dry-inflector (~> 0.1, >= 0.1.2) dry-logic (~> 1.0, >= 1.0.2) erubi (1.10.0) + eventmachine (1.2.7) execjs (2.8.1) factory_bot (6.2.1) activesupport (>= 5.0.0) @@ -441,6 +443,10 @@ GEM sunspot (2.5.0) pr_geohash (~> 1.0) rsolr (>= 1.1.1, < 3) + thin (1.8.2) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) thor (1.2.1) thread_safe (0.3.6) tilt (2.0.10) @@ -471,6 +477,7 @@ GEM PLATFORMS arm64-darwin-22 x86_64-darwin-20 + x86_64-darwin-22 x86_64-linux DEPENDENCIES @@ -525,6 +532,7 @@ DEPENDENCIES sqlite3 sunspot_rails! sunspot_solr! + thin turbolinks uglifier (>= 1.3.0) webpacker