From a44a6f878a74efdd7ea1a52f583c3f0d841b5d4b Mon Sep 17 00:00:00 2001
From: Chris Constable <chris.constable@temporal.io>
Date: Thu, 4 Jun 2026 13:53:32 -0400
Subject: [PATCH 1/2] Add CHANGELOG and document the update process

Add a CHANGELOG.md with an Unreleased section, set CHANGELOG.md to merge=union via .gitattributes, and document in CONTRIBUTING.md when and how to add entries.
---
 CHANGELOG.md    | 18 +++++++++++++++++-
 CONTRIBUTING.md | 21 +++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 CONTRIBUTING.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0051119d..7017b55c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,4 +28,20 @@ and `Client#count_activities` provide visibility-backed queries; and `Client#asy
 accepts a standalone-form `ActivityIDReference` (constructed via `ActivityIDReference.for_standalone`) for
 async completion.
 
-See https://docs.temporal.io/standalone-activity for the cross-SDK feature overview.
\ No newline at end of file
+See https://docs.temporal.io/standalone-activity for the cross-SDK feature overview.
+<!--
+High-level release notes.
+Loosely based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
+
+When your PR includes a user-facing change, add an entry below under the
+appropriate heading (create the heading if it does not yet exist). Within
+each heading content can be free-form. Feel free to include examples, links
+to docs, or any other relevant information.
+
+### Added            — new features
+### Changed          — changes in existing functionality
+### Deprecated       — soon-to-be-removed features
+### Breaking Changes — removed or backwards-incompatible features
+### Fixed            — notable bug fixes
+### Security         — notable security fixes
+-->
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..b6aaaa59
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,21 @@
+# Contributing to the Temporal Ruby SDK
+
+Thanks for your interest in contributing!
+
+All contributors must complete the Temporal Contributor License Agreement (CLA) before changes
+can be merged. A link to the CLA will be posted in the PR.
+
+See the [README](README.md) for build and development instructions.
+
+## Changelog
+
+User-facing changes are recorded in [`CHANGELOG.md`](CHANGELOG.md), loosely following the
+[Keep a Changelog](https://keepachangelog.com/en/1.1.0/) format.
+
+If your PR includes a user-facing change (new feature, behavior change, deprecation, breaking
+change, notable bug fix, or security fix), add a short, high-level entry to the `## [Unreleased]`
+section at the top of `CHANGELOG.md` under the appropriate heading, creating it if needed:
+Added, Changed, Deprecated, Breaking Changes, Fixed, or Security.
+
+Keep entries high-level and written for users. The full commit log is appended at release time,
+so internal-only changes (refactors, tests, CI, docs) don't need an entry.

From 2c9f133d50b1a26c4657763c9ab0ad5b2e97d483 Mon Sep 17 00:00:00 2001
From: Chris Constable <chris.constable@temporal.io>
Date: Thu, 4 Jun 2026 14:41:47 -0400
Subject: [PATCH 2/2] Move changelog comments to top of file for better
 readability.

---
 CHANGELOG.md | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7017b55c..e28df6f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+<!--
+High-level release notes.
+Loosely based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
+
+When your PR includes a user-facing change, add an entry below under the
+appropriate heading (create the heading if it does not yet exist). Within
+each heading content can be free-form. Feel free to include examples, links
+to docs, or any other relevant information.
+
+### Added            — new features
+### Changed          — changes in existing functionality
+### Deprecated       — soon-to-be-removed features
+### Breaking Changes — removed or backwards-incompatible features
+### Fixed            — notable bug fixes
+### Security         — notable security fixes
+-->
+
 # Changelog
 
 ## [Unreleased]
@@ -29,19 +46,3 @@ accepts a standalone-form `ActivityIDReference` (constructed via `ActivityIDRefe
 async completion.
 
 See https://docs.temporal.io/standalone-activity for the cross-SDK feature overview.
-<!--
-High-level release notes.
-Loosely based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
-
-When your PR includes a user-facing change, add an entry below under the
-appropriate heading (create the heading if it does not yet exist). Within
-each heading content can be free-form. Feel free to include examples, links
-to docs, or any other relevant information.
-
-### Added            — new features
-### Changed          — changes in existing functionality
-### Deprecated       — soon-to-be-removed features
-### Breaking Changes — removed or backwards-incompatible features
-### Fixed            — notable bug fixes
-### Security         — notable security fixes
--->