Skip to content

Commit

Permalink
Merge branch 'master' of github.com:jclusso/d53.co
Browse files Browse the repository at this point in the history
* 'master' of github.com:jclusso/d53.co:
  Bump pg from 1.5.4 to 1.5.5
  Bump rails from `acfaac6` to `9e01d93`
  • Loading branch information
jclusso committed Feb 16, 2024
2 parents a929231 + 180741d commit 90385ac
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ gem "rails", github: "rails/rails", branch: "main"
gem "sprockets-rails"

# Use postgresql as the database for Active Record
gem "pg", "~> 1.1"
gem "pg", "~> 1.5"

# Use the Puma web server [https://github.com/puma/puma]
gem "puma", ">= 5.0"
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/rails/rails.git
revision: acfaac6ef8efdb523659b74ce30a71e392b60346
revision: 9e01d93547e2082e2e88472748baa0f9ea63c181
branch: main
specs:
actioncable (7.2.0.alpha)
Expand Down Expand Up @@ -184,7 +184,7 @@ GEM
parser (3.3.0.5)
ast (~> 2.4.1)
racc
pg (1.5.4)
pg (1.5.5)
psych (5.1.2)
stringio
public_suffix (5.0.4)
Expand Down Expand Up @@ -317,7 +317,7 @@ DEPENDENCIES
dockerfile-rails (>= 1.6)
importmap-rails
minitest-retry
pg (~> 1.1)
pg (~> 1.5)
puma (>= 5.0)
rails!
redis (>= 4.0.1)
Expand Down

0 comments on commit 90385ac

Please sign in to comment.