Skip to content

Commit

Permalink
Merge pull request #1721 from sul-dlss/update-dependencies
Browse files Browse the repository at this point in the history
Merged by automated merge script
  • Loading branch information
jmartin-sul authored Aug 12, 2024
2 parents afc079a + aa1b03a commit 7541ca3
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 10 deletions.
5 changes: 5 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -566,3 +566,8 @@ Rails/EnvLocal: # new in 2.22

FactoryBot/ExcessiveCreateList: # new in 2.25
Enabled: false # we had an existing test that ran afoul of this rule when it was added, and the limit of 10 seems arbitrary

Gemspec/AddRuntimeDependency: # new in 1.65
Enabled: true
Style/SendWithLiteralMethodName: # new in 1.64
Enabled: true
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rails', '~> 7.1' # allow rails to be updated to 7.1.x (will be needed for sqlite 2 to work)
gem 'rails', '~> 7.1.3' # allow rails to be updated to 7.1.x (will be needed for sqlite 2 to work)

gem 'nokogiri', '>= 1.7.1'

Expand Down
18 changes: 9 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ GEM
bundler-audit (~> 0.5)
capistrano (~> 3.0)
capistrano-bundler (>= 1.4)
capistrano-bundler (2.1.0)
capistrano-bundler (2.1.1)
capistrano (~> 3.1)
capistrano-one_time_key (0.2.0)
capistrano (~> 3.0)
Expand Down Expand Up @@ -154,7 +154,7 @@ GEM
rb_sys (~> 0.9)
commonmarker (1.1.5-x86_64-darwin)
commonmarker (1.1.5-x86_64-linux)
concurrent-ruby (1.3.3)
concurrent-ruby (1.3.4)
config (5.5.1)
deep_merge (~> 1.2, >= 1.2.1)
connection_pool (2.4.1)
Expand Down Expand Up @@ -241,7 +241,7 @@ GEM
hana (1.3.7)
hashdiff (1.1.1)
hashie (5.0.0)
honeybadger (5.15.4)
honeybadger (5.15.5)
htmlentities (4.3.4)
httpclient (2.8.3)
i18n (1.14.5)
Expand Down Expand Up @@ -351,8 +351,8 @@ GEM
paper_trail (15.1.0)
activerecord (>= 6.1)
request_store (~> 1.4)
parallel (1.25.1)
parser (3.3.4.0)
parallel (1.26.2)
parser (3.3.4.2)
ast (~> 2.4.1)
racc
patience_diff (1.2.0)
Expand Down Expand Up @@ -423,7 +423,7 @@ GEM
rack (>= 1.4)
retina_tag (1.4.1)
rails (>= 3.1)
rexml (3.3.4)
rexml (3.3.5)
strscan
rspec (3.13.0)
rspec-core (~> 3.13.0)
Expand Down Expand Up @@ -457,7 +457,7 @@ GEM
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.3)
rubocop-ast (1.32.0)
parser (>= 3.3.1.0)
rubocop-capybara (2.21.0)
rubocop (~> 1.41)
Expand All @@ -470,7 +470,7 @@ GEM
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-rspec (3.0.3)
rubocop-rspec (3.0.4)
rubocop (~> 1.61)
rubocop-rspec_rails (2.30.0)
rubocop (~> 1.61)
Expand Down Expand Up @@ -587,7 +587,7 @@ DEPENDENCIES
parallel
pry
pry-doc
rails (~> 7.1)
rails (~> 7.1.3)
rails-controller-testing
rake
retina_tag
Expand Down

0 comments on commit 7541ca3

Please sign in to comment.