Skip to content

Commit

Permalink
Merge pull request #1191 from dradis/puma-server
Browse files Browse the repository at this point in the history
Replace unicorn with puma
  • Loading branch information
aapomm authored Nov 10, 2023
2 parents 99b9caf + b324077 commit b26829c
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 22 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[v#.#.#] ([month] [YYYY])
- Upgrade to Rails 7.0.8
- Replace unicorn with puma in production
- Add importmap-rails to handle js libraries
- Upgraded gems:
- [gem]
Expand Down
11 changes: 3 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,12 @@ gem 'net-smtp'
gem 'net-pop'
gem 'net-imap'

gem 'puma', '6.4.0'

# ------------------------------------------------------------------ Deployment
# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

group :production do
# Use Unicorn as the web server
gem 'unicorn', '6.1.0'
end

# ----------------------------------------------------- Development and Testing
group :development do
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
Expand Down Expand Up @@ -187,14 +184,12 @@ group :development, :test do
gem 'byebug', platform: :mri

gem 'rspec-rails', '~> 4.0.2'

gem 'puma', '~> 5.6.7'
end

group :test do
gem 'database_cleaner'
gem 'factory_bot_rails'
gem 'capybara', '~> 3.35.1'
gem 'capybara', '~> 3.39'
gem 'guard-rspec', require: false
gem 'selenium-webdriver', '~> 4.11'
gem 'shoulda-matchers', '~> 3.1'
Expand Down
23 changes: 9 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ GEM
tzinfo (~> 2.0)
acts_as_tree (2.9.1)
activerecord (>= 3.0.0)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
ast (2.4.2)
autoprefixer-rails (10.4.13.0)
execjs (~> 2)
Expand All @@ -106,8 +106,9 @@ GEM
thor (~> 1.0)
byebug (11.1.1)
cancancan (1.17.0)
capybara (3.35.3)
capybara (3.39.2)
addressable
matrix
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
Expand Down Expand Up @@ -259,7 +260,6 @@ GEM
activerecord
kaminari-core (= 1.2.1)
kaminari-core (1.2.1)
kgio (2.11.4)
launchy (2.4.3)
addressable (~> 2.3)
letter_opener (1.7.0)
Expand Down Expand Up @@ -331,8 +331,8 @@ GEM
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (4.0.6)
puma (5.6.7)
public_suffix (5.0.3)
puma (6.4.0)
nio4r (~> 2.0)
racc (1.7.1)
rack (2.2.8)
Expand Down Expand Up @@ -374,7 +374,6 @@ GEM
thor (~> 1.0)
zeitwerk (~> 2.5)
rainbow (3.1.1)
raindrops (0.20.0)
rake (13.0.6)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
Expand All @@ -384,7 +383,7 @@ GEM
redis (4.7.0)
redis-namespace (1.8.2)
redis (>= 3.0.4)
regexp_parser (2.1.1)
regexp_parser (2.8.2)
request_store (1.5.1)
rack (>= 1.4)
rerun (0.13.0)
Expand Down Expand Up @@ -492,9 +491,6 @@ GEM
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.3.0)
unicorn (6.1.0)
kgio (~> 2.6)
raindrops (~> 0.7)
vegas (0.1.11)
rack (>= 1.0.0)
warden (1.2.8)
Expand Down Expand Up @@ -531,7 +527,7 @@ DEPENDENCIES
bundler-audit
byebug
cancancan (~> 1.10)
capybara (~> 3.35.1)
capybara (~> 3.39)
coffee-rails (~> 5.0)
database_cleaner
differ (~> 0.1.2)
Expand Down Expand Up @@ -588,7 +584,7 @@ DEPENDENCIES
paper_trail (~> 12.2.0)
parslet (~> 1.6.0)
pg
puma (~> 5.6.7)
puma (= 6.4.0)
rack-mini-profiler (~> 2.0)
rails (~> 7.0.8)
rails-html-sanitizer (~> 1.4.4)
Expand All @@ -615,7 +611,6 @@ DEPENDENCIES
time (>= 0.2.2)
timecop
turbolinks (~> 5)
unicorn (= 6.1.0)
warden (~> 1.2.3)
web-console (>= 4.1.0)
whenever
Expand Down

0 comments on commit b26829c

Please sign in to comment.