diff options
author | Robert Speicher <robert@gitlab.com> | 2016-11-04 16:02:51 +0300 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-11-04 16:02:51 +0300 |
commit | e4c05de75ccec1b0d64a7a994f05d54bffc903e5 (patch) | |
tree | f0576cd24562c39bb9fde9fbd53b32c0a5466069 | |
parent | 588bc001e27080d2583781426e2336ffa09f70e5 (diff) | |
parent | 9dc3c4c044b8d73a2fa632eac08576ffa9c52194 (diff) |
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
-rw-r--r-- | Gemfile | 5 | ||||
-rw-r--r-- | Gemfile.lock | 8 | ||||
-rw-r--r-- | doc/development/rake_tasks.md | 8 | ||||
-rw-r--r-- | lib/tasks/gitlab/generate_docs.rake | 7 |
4 files changed, 3 insertions, 25 deletions
@@ -104,7 +104,7 @@ gem 'deckar01-task_list', '1.0.5', require: 'task_list/railtie' gem 'gitlab-markup', '~> 1.5.0' gem 'redcarpet', '~> 3.3.3' gem 'RedCloth', '~> 4.3.2' -gem 'rdoc', '~>3.6' +gem 'rdoc', '~> 4.2' gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' @@ -260,9 +260,6 @@ group :development do gem 'better_errors', '~> 1.0.1' gem 'binding_of_caller', '~> 0.7.2' - # Docs generator - gem 'sdoc', '~> 0.3.20' - # thin instead webrick gem 'thin', '~> 1.7.0' end diff --git a/Gemfile.lock b/Gemfile.lock index 888fa6b2bf5..3ecff5f6a68 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -567,7 +567,7 @@ GEM ffi (>= 0.5.0) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) - rdoc (3.12.2) + rdoc (4.2.2) json (~> 1.4) recaptcha (3.0.0) json @@ -663,9 +663,6 @@ GEM scss_lint (0.47.1) rake (>= 0.9, < 11) sass (~> 3.4.15) - sdoc (0.3.20) - json (>= 1.1.3) - rdoc (~> 3.10) seed-fu (2.3.6) activerecord (>= 3.1) activesupport (>= 3.1) @@ -936,7 +933,7 @@ DEPENDENCIES rails-deprecated_sanitizer (~> 1.0.3) rainbow (~> 2.1.0) rblineprof (~> 0.3.6) - rdoc (~> 3.6) + rdoc (~> 4.2) recaptcha (~> 3.0) redcarpet (~> 3.3.3) redis (~> 3.2) @@ -956,7 +953,6 @@ DEPENDENCIES sanitize (~> 2.0) sass-rails (~> 5.0.6) scss_lint (~> 0.47.0) - sdoc (~> 0.3.20) seed-fu (~> 2.3.5) select2-rails (~> 3.5.9) sentry-raven (~> 2.0.0) diff --git a/doc/development/rake_tasks.md b/doc/development/rake_tasks.md index a7175f3f87e..827db7e99b8 100644 --- a/doc/development/rake_tasks.md +++ b/doc/development/rake_tasks.md @@ -42,14 +42,6 @@ To run several tests inside one directory: If you want to use [Spring](https://github.com/rails/spring) set `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) ``` diff --git a/lib/tasks/gitlab/generate_docs.rake b/lib/tasks/gitlab/generate_docs.rake deleted file mode 100644 index f6448c38e10..00000000000 --- a/lib/tasks/gitlab/generate_docs.rake +++ /dev/null @@ -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 - |