diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-11-03 10:50:26 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-11-03 17:26:03 +0000 |
| commit | 9dc3c4c044b8d73a2fa632eac08576ffa9c52194 (patch) | |
| tree | 17ed427fecaaa980a17e24b0e11167d61f786dc8 | |
| parent | 4ba789cd40dfca5de9569dc34db2c4b0252437fc (diff) | |
| download | gitlab-ce-rs-update-rdoc.tar.gz | |
Update rdoc to `~> 4.2`rs-update-rdoc
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2814
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 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' diff --git a/Gemfile.lock b/Gemfile.lock index f7a6b86518b..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 @@ -933,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) |