Skip to content

Commit

Permalink
Merge pull request #102 from pulibrary/fixing-rails-server
Browse files Browse the repository at this point in the history
Ensures that the thin server is used for the dev environment
  • Loading branch information
carolyncole authored Sep 12, 2023
2 parents e94f6c3 + 407baf0 commit 73be4c1
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
10 changes: 6 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ group :development do
gem "capistrano-bundler"
gem "capistrano-passenger"
gem "capistrano-rails"

gem "thin"
end

group :test do
Expand All @@ -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"
Expand Down
8 changes: 8 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -471,6 +477,7 @@ GEM
PLATFORMS
arm64-darwin-22
x86_64-darwin-20
x86_64-darwin-22
x86_64-linux

DEPENDENCIES
Expand Down Expand Up @@ -525,6 +532,7 @@ DEPENDENCIES
sqlite3
sunspot_rails!
sunspot_solr!
thin
turbolinks
uglifier (>= 1.3.0)
webpacker
Expand Down

0 comments on commit 73be4c1

Please sign in to comment.