Skip to content

Commit 13252f0

Browse files
authored
Merge pull request rails#51899 from zzak/bump-rdoc
Use released version of RDoc v6.7.0
2 parents 21bbf5a + 467e8fe commit 13252f0

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ end
6161

6262
group :doc do
6363
gem "sdoc", git: "https://github.com/rails/sdoc.git", branch: "main"
64-
gem "rdoc", github: "rails/rdoc", branch: "master"
64+
gem "rdoc", "~> 6.7"
6565
gem "redcarpet", "~> 3.2.3", platforms: :ruby
6666
gem "w3c_validators", "~> 1.3.6"
6767
gem "rouge"

Gemfile.lock

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,6 @@ GIT
1414
specs:
1515
httpclient (2.8.3)
1616

17-
GIT
18-
remote: https://github.com/rails/rdoc.git
19-
revision: 7472b691920b65b9e0f9f4d1bd6ed757c71d5c70
20-
branch: master
21-
specs:
22-
rdoc (6.6.3.1)
23-
psych (>= 4.0.0)
24-
2517
GIT
2618
remote: https://github.com/rails/sdoc.git
2719
revision: e9bb867eba81f48c402a129e688e810ec1fa387c
@@ -443,6 +435,8 @@ GEM
443435
rb-inotify (0.10.1)
444436
ffi (~> 1.0)
445437
rbtree (0.4.6)
438+
rdoc (6.7.0)
439+
psych (>= 4.0.0)
446440
redcarpet (3.2.3)
447441
redis (5.0.8)
448442
redis-client (>= 0.17.0)
@@ -667,7 +661,7 @@ DEPENDENCIES
667661
rack-cache (~> 1.2)
668662
rails!
669663
rake (>= 13)
670-
rdoc!
664+
rdoc (~> 6.7)
671665
redcarpet (~> 3.2.3)
672666
redis (>= 4.0.1)
673667
redis-namespace

0 commit comments

Comments
 (0)