Skip to content

Commit

Permalink
Merge pull request #1199 from sul-dlss/update-rdoc
Browse files Browse the repository at this point in the history
Fix issue discovered in RDoc 6.3.3 through 6.6.2
  • Loading branch information
shelleydoljack authored Mar 26, 2024
2 parents d444560 + f618d13 commit 97b686f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ gem 'tsv'
gem 'tiny_tds', '~> 2.1.3'
# Pin mimemagic to fix issue with rails 5.2
gem 'mimemagic', '0.4.3'
# Fix issue discovered in RDoc 6.3.3 through 6.6.2, as distributed in Ruby 3.x through 3.3.0.
gem "rdoc", ">= 6.6.3.1"

group :production do
gem 'activerecord-oracle_enhanced-adapter', '~> 5.2.8'
Expand Down
7 changes: 4 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ GEM
parallel (1.23.0)
parser (3.2.2.1)
ast (~> 2.4.1)
psych (4.0.4)
psych (5.1.2)
stringio
public_suffix (5.0.1)
racc (1.7.3)
Expand Down Expand Up @@ -254,7 +254,7 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rdoc (6.4.0)
rdoc (6.6.3.1)
psych (>= 4.0.0)
regexp_parser (2.8.0)
rexml (3.2.6)
Expand Down Expand Up @@ -348,7 +348,7 @@ GEM
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
ssrf_filter (1.1.1)
stringio (3.0.2)
stringio (3.1.0)
sul_styles (0.7.0)
rails (>= 4.1, < 8)
sync (0.5.0)
Expand Down Expand Up @@ -415,6 +415,7 @@ DEPENDENCIES
okcomputer
rails (~> 5.2.8.1)
rails-controller-testing
rdoc (>= 6.6.3.1)
rspec-rails
rubocop
rubocop-performance
Expand Down

0 comments on commit 97b686f

Please sign in to comment.