Skip to content

Commit

Permalink
Merge branch 'master' into Rails-7.1-upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
murny authored Mar 5, 2024
2 parents 6b9aae2 + b189ed7 commit fc3bdd5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ gem 'rdf-vocab', '~> 3.3.0' # this gem changed predicate names without warning,

# Database stuff
gem 'connection_pool'
gem 'pg', '~> 1.5.5'
gem 'pg', '~> 1.5.6'
gem 'redis', '~> 4.8'
gem 'rsolr'
gem 'strong_migrations', '~> 1.7.0'
Expand Down
18 changes: 9 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,13 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
childprocess (5.0.0)
claide (1.1.0)
claide-plugins (0.9.2)
cork
nap
open4 (~> 1.3)
clamby (1.6.10)
clamby (1.6.11)
colored2 (3.1.2)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
Expand Down Expand Up @@ -321,8 +322,9 @@ GEM
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
language_server-protocol (3.17.0.3)
launchy (2.5.2)
launchy (3.0.0)
addressable (~> 2.8)
childprocess (~> 5.0)
link_header (0.0.8)
logger (1.5.3)
loofah (2.22.0)
Expand Down Expand Up @@ -387,8 +389,7 @@ GEM
parser (3.3.0.5)
ast (~> 2.4.1)
racc
pg (1.5.5)
prism (0.24.0)
pg (1.5.6)
psych (5.1.0)
stringio
public_suffix (5.0.4)
Expand Down Expand Up @@ -496,20 +497,19 @@ GEM
rubocop-ast (>= 1.30.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.0)
rubocop-ast (1.31.1)
parser (>= 3.3.0.4)
prism (>= 0.24.0)
rubocop-minitest (0.34.5)
rubocop (>= 1.39, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
rubocop-performance (1.20.2)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
rubocop-rails (2.23.1)
rubocop-rails (2.24.0)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (1.13.0)
ruby-saml (1.15.0)
nokogiri (>= 1.13.10)
Expand Down Expand Up @@ -669,7 +669,7 @@ DEPENDENCIES
omniauth-rails_csrf_protection (~> 1.0)
omniauth-saml (~> 2.1)
paper_trail (~> 15.1.0)
pg (~> 1.5.5)
pg (~> 1.5.6)
puma (~> 6.4)
pundit (= 2.3.1)
rails (~> 7.1.3)
Expand Down

0 comments on commit fc3bdd5

Please sign in to comment.