Merge branch 'rs-update-rdoc' into 'master'
Update rdoc to `~> 4.2` Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2814 See merge request !7261
This commit is contained in:
commit
e4c05de75c
4 changed files with 3 additions and 25 deletions
5
Gemfile
5
Gemfile
|
@ -104,7 +104,7 @@ gem 'deckar01-task_list', '1.0.5', require: 'task_list/railtie'
|
||||||
gem 'gitlab-markup', '~> 1.5.0'
|
gem 'gitlab-markup', '~> 1.5.0'
|
||||||
gem 'redcarpet', '~> 3.3.3'
|
gem 'redcarpet', '~> 3.3.3'
|
||||||
gem 'RedCloth', '~> 4.3.2'
|
gem 'RedCloth', '~> 4.3.2'
|
||||||
gem 'rdoc', '~>3.6'
|
gem 'rdoc', '~> 4.2'
|
||||||
gem 'org-ruby', '~> 0.9.12'
|
gem 'org-ruby', '~> 0.9.12'
|
||||||
gem 'creole', '~> 0.5.0'
|
gem 'creole', '~> 0.5.0'
|
||||||
gem 'wikicloth', '0.8.1'
|
gem 'wikicloth', '0.8.1'
|
||||||
|
@ -260,9 +260,6 @@ group :development do
|
||||||
gem 'better_errors', '~> 1.0.1'
|
gem 'better_errors', '~> 1.0.1'
|
||||||
gem 'binding_of_caller', '~> 0.7.2'
|
gem 'binding_of_caller', '~> 0.7.2'
|
||||||
|
|
||||||
# Docs generator
|
|
||||||
gem 'sdoc', '~> 0.3.20'
|
|
||||||
|
|
||||||
# thin instead webrick
|
# thin instead webrick
|
||||||
gem 'thin', '~> 1.7.0'
|
gem 'thin', '~> 1.7.0'
|
||||||
end
|
end
|
||||||
|
|
|
@ -567,7 +567,7 @@ GEM
|
||||||
ffi (>= 0.5.0)
|
ffi (>= 0.5.0)
|
||||||
rblineprof (0.3.6)
|
rblineprof (0.3.6)
|
||||||
debugger-ruby_core_source (~> 1.3)
|
debugger-ruby_core_source (~> 1.3)
|
||||||
rdoc (3.12.2)
|
rdoc (4.2.2)
|
||||||
json (~> 1.4)
|
json (~> 1.4)
|
||||||
recaptcha (3.0.0)
|
recaptcha (3.0.0)
|
||||||
json
|
json
|
||||||
|
@ -663,9 +663,6 @@ GEM
|
||||||
scss_lint (0.47.1)
|
scss_lint (0.47.1)
|
||||||
rake (>= 0.9, < 11)
|
rake (>= 0.9, < 11)
|
||||||
sass (~> 3.4.15)
|
sass (~> 3.4.15)
|
||||||
sdoc (0.3.20)
|
|
||||||
json (>= 1.1.3)
|
|
||||||
rdoc (~> 3.10)
|
|
||||||
seed-fu (2.3.6)
|
seed-fu (2.3.6)
|
||||||
activerecord (>= 3.1)
|
activerecord (>= 3.1)
|
||||||
activesupport (>= 3.1)
|
activesupport (>= 3.1)
|
||||||
|
@ -936,7 +933,7 @@ DEPENDENCIES
|
||||||
rails-deprecated_sanitizer (~> 1.0.3)
|
rails-deprecated_sanitizer (~> 1.0.3)
|
||||||
rainbow (~> 2.1.0)
|
rainbow (~> 2.1.0)
|
||||||
rblineprof (~> 0.3.6)
|
rblineprof (~> 0.3.6)
|
||||||
rdoc (~> 3.6)
|
rdoc (~> 4.2)
|
||||||
recaptcha (~> 3.0)
|
recaptcha (~> 3.0)
|
||||||
redcarpet (~> 3.3.3)
|
redcarpet (~> 3.3.3)
|
||||||
redis (~> 3.2)
|
redis (~> 3.2)
|
||||||
|
@ -956,7 +953,6 @@ DEPENDENCIES
|
||||||
sanitize (~> 2.0)
|
sanitize (~> 2.0)
|
||||||
sass-rails (~> 5.0.6)
|
sass-rails (~> 5.0.6)
|
||||||
scss_lint (~> 0.47.0)
|
scss_lint (~> 0.47.0)
|
||||||
sdoc (~> 0.3.20)
|
|
||||||
seed-fu (~> 2.3.5)
|
seed-fu (~> 2.3.5)
|
||||||
select2-rails (~> 3.5.9)
|
select2-rails (~> 3.5.9)
|
||||||
sentry-raven (~> 2.0.0)
|
sentry-raven (~> 2.0.0)
|
||||||
|
|
|
@ -42,14 +42,6 @@ To run several tests inside one directory:
|
||||||
If you want to use [Spring](https://github.com/rails/spring) set
|
If you want to use [Spring](https://github.com/rails/spring) set
|
||||||
`ENABLE_SPRING=1` in your environment.
|
`ENABLE_SPRING=1` in your environment.
|
||||||
|
|
||||||
## Generate searchable docs for source code
|
|
||||||
|
|
||||||
You can find results under the `doc/code` directory.
|
|
||||||
|
|
||||||
```
|
|
||||||
bundle exec rake gitlab:generate_docs
|
|
||||||
```
|
|
||||||
|
|
||||||
## Generate API documentation for project services (e.g. Slack)
|
## Generate API documentation for project services (e.g. Slack)
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
namespace :gitlab do
|
|
||||||
desc "GitLab | Generate sdocs for project"
|
|
||||||
task generate_docs: :environment do
|
|
||||||
system(*%W(bundle exec sdoc -o doc/code app lib))
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
Loading…
Reference in a new issue