Merge branch 'ruby:master' into mldsa-oid-and-load-gating

Author: justsmth

.changelog.yml

@@ -1,55 +1,49 @@
 ---
 
-rubygems:
-  header_template: "## %new_version / %release_date"
-
-  entry_template: "* %title. Pull request [#%pull_request_number](%pull_request_url) by %pull_request_author"
-
-  extra_entry:
-    template: "* %title."
-    label: "rubygems: enhancement"
-
-  release_date_format: "%Y-%m-%d"
-
-  changelog_label_mapping:
-    "rubygems: feature": "### Features:"
-    "rubygems: performance": "### Performance:"
-    "rubygems: enhancement": "### Enhancements:"
-    "rubygems: bug fix": "### Bug fixes:"
-    "rubygems: security": "### Security:"
-    "rubygems: breaking change": "### Breaking changes:"
-    "rubygems: deprecation": "### Deprecations:"
-    "rubygems: documentation": "### Documentation:"
-    "rubygems: skip changelog": null
-
-  patch_level_labels:
-    - "rubygems: enhancement"
-    - "rubygems: bug fix"
-    - "rubygems: security"
-    - "rubygems: documentation"
-    - "rubygems: skip changelog"
-
-bundler:
-  header_template: "## %new_version / %release_date"
-
-  entry_template: "* %title. Pull request [#%pull_request_number](%pull_request_url) by %pull_request_author"
-
-  release_date_format: "%Y-%m-%d"
-
-  changelog_label_mapping:
-    "bundler: feature": "### Features:"
-    "bundler: performance": "### Performance:"
-    "bundler: enhancement": "### Enhancements:"
-    "bundler: bug fix": "### Bug fixes:"
-    "bundler: security": "### Security:"
-    "bundler: breaking change": "### Breaking changes:"
-    "bundler: deprecation": "### Deprecations:"
-    "bundler: documentation": "### Documentation:"
-    "bundler: skip changelog": null
-
-  patch_level_labels:
-    - "bundler: enhancement"
-    - "bundler: bug fix"
-    - "bundler: security"
-    - "bundler: documentation"
-    - "bundler: skip changelog"
+header_template: "## %new_version / %release_date"
+
+entry_template: "* %title. Pull request [#%pull_request_number](%pull_request_url) by %pull_request_author"
+
+extra_entry:
+  template: "* %title."
+  label: "rubygems: enhancement"
+
+already_released_template: Changes already released in %released_in are not repeated here.
+
+release_date_format: "%Y-%m-%d"
+
+library_headings:
+  rubygems: RubyGems
+  bundler: Bundler
+
+changelog_label_mapping:
+  "rubygems: feature": "Features:"
+  "bundler: feature": "Features:"
+  "rubygems: performance": "Performance:"
+  "bundler: performance": "Performance:"
+  "rubygems: enhancement": "Enhancements:"
+  "bundler: enhancement": "Enhancements:"
+  "rubygems: bug fix": "Bug fixes:"
+  "bundler: bug fix": "Bug fixes:"
+  "rubygems: security": "Security:"
+  "bundler: security": "Security:"
+  "rubygems: breaking change": "Breaking changes:"
+  "bundler: breaking change": "Breaking changes:"
+  "rubygems: deprecation": "Deprecations:"
+  "bundler: deprecation": "Deprecations:"
+  "rubygems: documentation": "Documentation:"
+  "bundler: documentation": "Documentation:"
+  "rubygems: skip changelog": null
+  "bundler: skip changelog": null
+
+patch_level_labels:
+  - "rubygems: enhancement"
+  - "bundler: enhancement"
+  - "rubygems: bug fix"
+  - "bundler: bug fix"
+  - "rubygems: security"
+  - "bundler: security"
+  - "rubygems: documentation"
+  - "bundler: documentation"
+  - "rubygems: skip changelog"
+  - "bundler: skip changelog"

.rubocop.yml

@@ -14,6 +14,7 @@ AllCops:
     - tmp/**/*
     - lib/rubygems/vendor/**/*
     - lib/bundler/vendor/**/*
+    - spec/support/vendor/**/*
   CacheRootDirectory: tmp/rubocop
   MaxFilesInCache: 5000