diff options
| author | John Cai <jcai@gitlab.com> | 2019-11-15 09:25:39 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2019-11-15 09:25:39 +0300 |
| commit | 5b8ea5450f5eb2323d2359b21da381519ca0a401 (patch) | |
| tree | 513ab194f8eda1a1aa4a16f58372e67848d5d856 | |
| parent | 9f407c2831127b23c5025f0e7d12124b43260bd9 (diff) | |
| parent | fd15cc2a054f260772ffed5143f887d36c23dca1 (diff) | |
Merge branch 'bump_rdoc' into 'master'
Bump rdoc to 6.0
See merge request gitlab-org/gitaly!1615
| -rw-r--r-- | ruby/Gemfile | 2 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile index 550bfae16..841f6bfde 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -7,7 +7,7 @@ gem 'rugged', '~> 0.28' gem 'github-linguist', '~> 7.5', require: 'linguist' gem 'gitlab-markup', '~> 1.7.0' gem 'activesupport', '~> 5.2.3' -gem 'rdoc', '~> 4.2' +gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false gem 'grpc', '~> 1.24.0' diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 0b4128444..146c6921f 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -146,7 +146,7 @@ GEM ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) - rdoc (4.3.0) + rdoc (6.2.0) redis (4.1.2) rouge (3.11.0) rspec (3.8.0) @@ -229,7 +229,7 @@ DEPENDENCIES listen (~> 0.5.0) pry (~> 0.12.2) rbtrace - rdoc (~> 4.2) + rdoc (~> 6.0) rspec rspec-parameterized rubocop (~> 0.69) |