gitlab-markup 2.1.0 → 2.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/.gitlab-ci.yml +1 -1
  3. data/HISTORY.md +4 -0
  4. data/gitlab-markup.gemspec +4 -2
  5. data/lib/github/markup/rdoc.rb +7 -5
  6. data/lib/github-markup.rb +1 -1
  7. metadata +20 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 790926e8c03a6d1e4a383c1bedd246625ca1e9cfe75c23d2fcf8ac88e08c3f93
4
- data.tar.gz: b0bec8c4d722247d81bb6253634633f7fa82cf9774092f1a1069e86b5ab75433
3
+ metadata.gz: 5c7d0b3c13484b4cd816732fcf490e181431fce66c88a28e3cd82116fa9201f5
4
+ data.tar.gz: b869c01afeeafacb2de6351c614342d74ac29251bebefe9136370df2bd4bcbc7
5
5
  SHA512:
6
- metadata.gz: 7208b88b8a5087edf00ce36318d870219b728202491a87e5d03692c0d262b42a7d1114b8999d04ba671e9c08349d20088ef4c7b13cdb6888639f2eb51630738a
7
- data.tar.gz: 98152d6bcb1a268f69a1b3c079c5ca21481d5305afd404a58bfd0d7810b7d21a48a6be8c5c70c68807c0f98e55a3a68d0a0351d59f446783012782221f3e2bfc
6
+ metadata.gz: 1f5115eb4e4bcf451982b92ac03abefad485c8c5a4b20bd03b833b2e4e2b774effa01effc6813b847cbf0e25a753acb68588a17e3c8dac74643d2868542331f0
7
+ data.tar.gz: fa84dbc0162f161276dbd60effc8f4f2c3c894ca8cb44096401aaabf1794ff1ddf9a1ad6e472c60f4c19082a50d34e4d1f218414797a9e4511b60d02823656ba
data/.gitlab-ci.yml CHANGED
@@ -48,7 +48,7 @@ ruby-docutils-spec:
48
48
  extends: .specs
49
49
  parallel:
50
50
  matrix:
51
- - RUBY_VERSION: ['3.0', '3.1', '3.2', '3.3', '3.4']
51
+ - RUBY_VERSION: ['3.2', '3.3', '3.4', '4.0']
52
52
  DOCUTILS_VERSION: ['0.21.2']
53
53
 
54
54
  # Dependency Scanning
data/HISTORY.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # History
2
2
 
3
+ ## 2.2.0 (2026-10-15)
4
+
5
+ * [Allow RDoc 8, require Ruby 3.2+](https://gitlab.com/gitlab-org/gitlab-markup/-/merge_requests/62)
6
+
3
7
  ## 2.1.0 (2026-05-26)
4
8
 
5
9
  * [Remove markdown, asciidoc, litcoffee, and pod rendering; make markup gem dependencies explicit](https://gitlab.com/gitlab-org/gitlab-markup/-/merge_requests/55)
data/gitlab-markup.gemspec CHANGED
@@ -15,6 +15,8 @@ Gem::Specification.new do |s|
15
15
  s.test_files = s.files.grep(%r{^(test|spec|features)/})
16
16
  s.require_paths = %w[lib]
17
17
 
18
+ s.required_ruby_version = '>= 3.2'
19
+
18
20
  s.metadata = {
19
21
  'bug_tracker_uri' => 'https://gitlab.com/gitlab-org/gitlab-markup/issues',
20
22
  'changelog_uri' => 'https://gitlab.com/gitlab-org/gitlab-markup/blob/master/HISTORY.md',
@@ -28,11 +30,11 @@ Gem::Specification.new do |s|
28
30
  s.add_development_dependency 'mutex_m', '~> 0.3.0'
29
31
  s.add_development_dependency 'nokogiri', '~> 1.13.8'
30
32
  s.add_development_dependency 'nokogiri-diff', '~> 0.2.0'
31
- s.add_development_dependency 'rdoc', '~> 6.12'
33
+ s.add_development_dependency 'rdoc', '>= 6.13', '< 9'
32
34
  s.add_development_dependency 'sanitize', '~> 6.0.0'
33
35
 
34
36
  s.add_dependency 'RedCloth', '~> 4.3'
35
- s.add_dependency 'rdoc', '~> 6.13'
37
+ s.add_dependency 'rdoc', '>= 6.13', '< 9'
36
38
  s.add_dependency 'org-ruby', '~> 0.9'
37
39
  s.add_dependency 'creole', '~> 0.5.0'
38
40
  s.add_dependency 'wikicloth', '=0.8.1'
data/lib/github/markup/rdoc.rb CHANGED
@@ -10,11 +10,13 @@ module GitHub
10
10
  end
11
11
 
12
12
  def render(content)
13
- if ::RDoc::VERSION.to_i >= 4
14
- h = ::RDoc::Markup::ToHtml.new(::RDoc::Options.new)
15
- else
16
- h = ::RDoc::Markup::ToHtml.new
17
- end
13
+ # RDoc 8 changed ToHtml.new to take keyword arguments instead of
14
+ # an RDoc::Options instance.
15
+ h = if ::RDoc::VERSION.to_i >= 8
16
+ ::RDoc::Markup::ToHtml.new
17
+ else
18
+ ::RDoc::Markup::ToHtml.new(::RDoc::Options.new)
19
+ end
18
20
  h.convert(content)
19
21
  end
20
22
 
data/lib/github-markup.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module GitHub
2
2
  module Markup
3
- VERSION = '2.1.0'
3
+ VERSION = '2.2.0'
4
4
  Version = VERSION
5
5
  end
6
6
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gitlab-markup
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.0
4
+ version: 2.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chris Wanstrath
@@ -112,16 +112,22 @@ dependencies:
112
112
  name: rdoc
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - "~>"
115
+ - - ">="
116
+ - !ruby/object:Gem::Version
117
+ version: '6.13'
118
+ - - "<"
116
119
  - !ruby/object:Gem::Version
117
- version: '6.12'
120
+ version: '9'
118
121
  type: :development
119
122
  prerelease: false
120
123
  version_requirements: !ruby/object:Gem::Requirement
121
124
  requirements:
122
- - - "~>"
125
+ - - ">="
126
+ - !ruby/object:Gem::Version
127
+ version: '6.13'
128
+ - - "<"
123
129
  - !ruby/object:Gem::Version
124
- version: '6.12'
130
+ version: '9'
125
131
  - !ruby/object:Gem::Dependency
126
132
  name: sanitize
127
133
  requirement: !ruby/object:Gem::Requirement
@@ -154,16 +160,22 @@ dependencies:
154
160
  name: rdoc
155
161
  requirement: !ruby/object:Gem::Requirement
156
162
  requirements:
157
- - - "~>"
163
+ - - ">="
158
164
  - !ruby/object:Gem::Version
159
165
  version: '6.13'
166
+ - - "<"
167
+ - !ruby/object:Gem::Version
168
+ version: '9'
160
169
  type: :runtime
161
170
  prerelease: false
162
171
  version_requirements: !ruby/object:Gem::Requirement
163
172
  requirements:
164
- - - "~>"
173
+ - - ">="
165
174
  - !ruby/object:Gem::Version
166
175
  version: '6.13'
176
+ - - "<"
177
+ - !ruby/object:Gem::Version
178
+ version: '9'
167
179
  - !ruby/object:Gem::Dependency
168
180
  name: org-ruby
169
181
  requirement: !ruby/object:Gem::Requirement
@@ -274,7 +286,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
274
286
  requirements:
275
287
  - - ">="
276
288
  - !ruby/object:Gem::Version
277
- version: '0'
289
+ version: '3.2'
278
290
  required_rubygems_version: !ruby/object:Gem::Requirement
279
291
  requirements:
280
292
  - - ">="