Skip to content

Commit

Permalink
Merge branch 'development' into dependabot/bundler/loofah-2.19.1
Browse files Browse the repository at this point in the history
  • Loading branch information
abdellani authored Apr 30, 2024
2 parents 5601b45 + d7be395 commit 84175eb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ gem 'rails', '~> 5.1.7'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 3.12'
gem 'puma', '~> 4.3'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
Expand Down
7 changes: 4 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@ GEM
racc (~> 1.4)
pg (1.2.0)
public_suffix (4.0.6)
puma (3.12.4)
puma (4.3.12)
nio4r (~> 2.0)
racc (1.6.1)
rack (2.2.3)
rack-test (1.1.0)
Expand Down Expand Up @@ -211,7 +212,7 @@ GEM
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.6)
tzinfo (1.2.10)
thread_safe (~> 0.1)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
Expand All @@ -236,7 +237,7 @@ DEPENDENCIES
jbuilder (~> 2.5)
listen (>= 3.0.5, < 3.2)
pg (>= 0.18, < 2.0)
puma (~> 3.12)
puma (~> 4.3)
rails (~> 5.1.7)
rspec-core!
rspec-expectations!
Expand Down

0 comments on commit 84175eb

Please sign in to comment.