gitlab-markup 2.1.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 790926e8c03a6d1e4a383c1bedd246625ca1e9cfe75c23d2fcf8ac88e08c3f93
-  data.tar.gz: b0bec8c4d722247d81bb6253634633f7fa82cf9774092f1a1069e86b5ab75433
+  metadata.gz: 07fdbceaf3ac4c23eaf4e3b2ba3039d7128c442da418f70f5e46e37422ca692a
+  data.tar.gz: fc47174cd8dc2d3019acb9d9f1399b841d91b97818cb6040866a31dc8c5fbcf2
 SHA512:
-  metadata.gz: 7208b88b8a5087edf00ce36318d870219b728202491a87e5d03692c0d262b42a7d1114b8999d04ba671e9c08349d20088ef4c7b13cdb6888639f2eb51630738a
-  data.tar.gz: 98152d6bcb1a268f69a1b3c079c5ca21481d5305afd404a58bfd0d7810b7d21a48a6be8c5c70c68807c0f98e55a3a68d0a0351d59f446783012782221f3e2bfc
+  metadata.gz: '0092c11fe007ff5dd6a9b0d321a54d918499fab4da110b0e65240f5fe6a96095c7c1e791737f1a9bc0fab069102f893be798f1cf343b6ab9f02aee8f44f7151d'
+  data.tar.gz: 6ee1e0614dacffd66279f9f5d2f625c5f4afd94b0d0fa1861e015d3795d0e52d5e5d5f2ab2ee274d3dbc57141e873f1733bb2fe3d3b606d1673bbf41757531b3

data/.gitlab-ci.yml

@@ -2,6 +2,10 @@ include:
   - template: SAST.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml
   - template: Security/Dependency-Scanning.gitlab-ci.yml # https://docs.gitlab.com/ee/user/application_security/dependency_scanning/
   - template: Security/Secret-Detection.gitlab-ci.yml # https://docs.gitlab.com/ee/user/application_security/secret_detection/
+  - component: gitlab.com/gitlab-org/components/gem-release/gem-release@~latest
+    inputs:
+      # The version is defined in lib/github-markup.rb, not the default lib/**/version.rb.
+      file_pattern_to_trigger_release: "lib/github-markup.rb"
 
 variables:
   LANG: "C.UTF-8"
@@ -48,7 +52,7 @@ ruby-docutils-spec:
   extends: .specs
   parallel:
     matrix:
-      - RUBY_VERSION: ['3.0', '3.1', '3.2', '3.3', '3.4']
+      - RUBY_VERSION: ['3.2', '3.3', '3.4', '4.0']
         DOCUTILS_VERSION: ['0.21.2']
 
 # Dependency Scanning

data/CONTRIBUTING.md

@@ -72,16 +72,33 @@ If nothing complains, congratulations!
 
 ## Releasing a new version
 
+Releases are automated by the
+[`gem-release`](https://gitlab.com/gitlab-org/components/gem-release) CI/CD
+component configured in `.gitlab-ci.yml`.
+
 If you are the current maintainer of this gem:
 
-0. Bump the version number in `lib/github-markup.rb`, adhering to [Semantic Versioning](http://semver.org/)
-0. Update `HISTORY.md`
-0. Test the latest version on GitHub
-  0. Build the new version with `rake build`
-  0. Copy `pkg/gitlab-markup*.gem` to `vendor/cache` in your local checkout of GitHub
-  0. Update the version for `gitlab-markup` in the `Gemfile`
-  0. Run `bundle update --local gitlab-markup`
-  0. Run any relevant tests and test it manually from the browser.
-0. Push the new gem release with `rake release`. If you don't have permission to release to rubygems.org, contact one of the existing owners (`gem owners gitlab-markup`) and ask them to add you.
+1. Open a merge request that bumps `VERSION` in `lib/github-markup.rb`, adhering
+   to [Semantic Versioning](https://semver.org/). Update `HISTORY.md` in the same
+   merge request, and add a `Changelog:` trailer to the commit so the change
+   appears in the generated release notes.
+2. Once the merge request is merged to `master`, the pipeline detects the change
+   to `lib/github-markup.rb` and runs the release jobs automatically: it builds
+   the gem, creates a GitLab release, and publishes the gem to RubyGems.
+
+Notes:
+
+- Only edit `lib/github-markup.rb` to bump `VERSION`. Any change to it on
+  `master` triggers the release jobs, so a non-version edit would start a release
+  for a version that is already published; the `gem push` then fails, which is
+  harmless (nothing is re-published) but produces a red pipeline.
+- The release is tagged with the bare version (for example `2.3.0`). Tags created
+  before this automation was adopted used a `v` prefix (`v2.2.0`); older tags are
+  left as-is.
+- Release notes are generated from `Changelog:` commit trailers via the GitLab
+  changelog API. Commits without that trailer produce empty notes.
+- Publishing requires the `GEM_HOST_API_KEY` CI/CD variable (a RubyGems API key
+  with push access), restricted to protected branches. If you need push access to
+  RubyGems, contact one of the existing owners (`gem owners gitlab-markup`).
 
 [1]: https://gitlab.com/gitlab-org/gitlab-markup/merge_requests

data/HISTORY.md

@@ -1,5 +1,13 @@
 # History
 
+## 2.2.1 (2026-10-15)
+
+* [Add automated gem release pipeline using the gem-release CI component](https://gitlab.com/gitlab-org/ruby/gems/gitlab-markup/-/merge_requests/63)
+
+## 2.2.0 (2026-10-15)
+
+* [Allow RDoc 8, require Ruby 3.2+](https://gitlab.com/gitlab-org/gitlab-markup/-/merge_requests/62)
+
 ## 2.1.0 (2026-05-26)
 
 * [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

@@ -15,6 +15,8 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = %w[lib]
 
+  s.required_ruby_version = '>= 3.2'
+
   s.metadata = {
     'bug_tracker_uri' => 'https://gitlab.com/gitlab-org/gitlab-markup/issues',
     'changelog_uri' => 'https://gitlab.com/gitlab-org/gitlab-markup/blob/master/HISTORY.md',
@@ -28,11 +30,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'mutex_m', '~> 0.3.0'
   s.add_development_dependency 'nokogiri', '~> 1.13.8'
   s.add_development_dependency 'nokogiri-diff', '~> 0.2.0'
-  s.add_development_dependency 'rdoc', '~> 6.12'
+  s.add_development_dependency 'rdoc', '>= 6.13', '< 9'
   s.add_development_dependency 'sanitize', '~> 6.0.0'
 
   s.add_dependency 'RedCloth', '~> 4.3'
-  s.add_dependency 'rdoc', '~> 6.13'
+  s.add_dependency 'rdoc', '>= 6.13', '< 9'
   s.add_dependency 'org-ruby', '~> 0.9'
   s.add_dependency 'creole', '~> 0.5.0'
   s.add_dependency 'wikicloth', '=0.8.1'

data/lib/github/markup/rdoc.rb

@@ -10,11 +10,13 @@ module GitHub
       end
 
       def render(content)
-        if ::RDoc::VERSION.to_i >= 4
-          h = ::RDoc::Markup::ToHtml.new(::RDoc::Options.new)
-        else
-          h = ::RDoc::Markup::ToHtml.new
-        end
+        # RDoc 8 changed ToHtml.new to take keyword arguments instead of
+        # an RDoc::Options instance.
+        h = if ::RDoc::VERSION.to_i >= 8
+              ::RDoc::Markup::ToHtml.new
+            else
+              ::RDoc::Markup::ToHtml.new(::RDoc::Options.new)
+            end
         h.convert(content)
       end
 

data/lib/github-markup.rb

@@ -1,6 +1,6 @@
 module GitHub
   module Markup
-    VERSION = '2.1.0'
+    VERSION = '2.2.1'
     Version = VERSION
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-markup
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Chris Wanstrath
 - GitLab Engineering Team
+autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -112,16 +113,22 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.13'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.12'
+        version: '9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.13'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.12'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
@@ -154,16 +161,22 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.13'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.13'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: org-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -267,6 +280,7 @@ metadata:
   bug_tracker_uri: https://gitlab.com/gitlab-org/gitlab-markup/issues
   changelog_uri: https://gitlab.com/gitlab-org/gitlab-markup/blob/master/HISTORY.md
   source_code_uri: https://gitlab.com/gitlab-org/gitlab-markup
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -274,14 +288,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Fork from github-markup GitLab uses to render non markdown content
 test_files: