mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #40515 from p8/sdoc-2.0.0
Use official sdoc gem instead of fork [skip ci]
This commit is contained in:
commit
473a6500e7
2 changed files with 4 additions and 10 deletions
2
Gemfile
2
Gemfile
|
@ -36,7 +36,7 @@ group :rubocop do
|
|||
end
|
||||
|
||||
group :doc do
|
||||
gem "sdoc", github: "p8/sdoc", branch: "without-frames"
|
||||
gem "sdoc", "~> 2.0"
|
||||
gem "redcarpet", "~> 3.2.3", platforms: :ruby
|
||||
gem "w3c_validators", "~> 1.3.6"
|
||||
gem "kindlerb", "~> 1.2.0"
|
||||
|
|
12
Gemfile.lock
12
Gemfile.lock
|
@ -28,14 +28,6 @@ GIT
|
|||
event_emitter
|
||||
websocket
|
||||
|
||||
GIT
|
||||
remote: https://github.com/p8/sdoc.git
|
||||
revision: a5e95cafdebf8a76ea21f2237e6349223f9ecac5
|
||||
branch: without-frames
|
||||
specs:
|
||||
sdoc (1.1.0)
|
||||
rdoc (>= 5.0)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/resque/redis-namespace.git
|
||||
revision: c31e63dc3cd5e59ef5ea394d4d46ac60d1e6f82e
|
||||
|
@ -470,6 +462,8 @@ GEM
|
|||
sprockets (> 3.0)
|
||||
sprockets-rails
|
||||
tilt
|
||||
sdoc (2.0.0)
|
||||
rdoc (>= 5.0)
|
||||
selenium-webdriver (3.142.7)
|
||||
childprocess (>= 0.5, < 4.0)
|
||||
rubyzip (>= 1.2.2)
|
||||
|
@ -619,7 +613,7 @@ DEPENDENCIES
|
|||
rubocop-performance
|
||||
rubocop-rails
|
||||
sass-rails
|
||||
sdoc!
|
||||
sdoc (~> 2.0)
|
||||
selenium-webdriver (>= 3.141.592)
|
||||
sequel
|
||||
sidekiq
|
||||
|
|
Loading…
Reference in a new issue