From b6bb5b46f8f7ad07611aaf076eb3791c59e54ab1 Mon Sep 17 00:00:00 2001 From: Pia B Date: Wed, 1 Jul 2026 16:15:49 +0200 Subject: [PATCH 01/13] add commitizen changellog tool --- .cz.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .cz.json diff --git a/.cz.json b/.cz.json new file mode 100644 index 00000000000..1a5b488e6a8 --- /dev/null +++ b/.cz.json @@ -0,0 +1,8 @@ +{ + "commitizen": { + "name": "cz_conventional_commits", + "tag_format": "v$version", + "version_scheme": "semver2", + "version": "4.6.2" + } +} From 3517a4f0ed759c5891c547e82e24bd3474280b55 Mon Sep 17 00:00:00 2001 From: Pia B Date: Thu, 2 Jul 2026 10:56:05 +0200 Subject: [PATCH 02/13] feat(commitizen): add standard commitizen config --- .cz.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.cz.json b/.cz.json index 1a5b488e6a8..f68f5022ac0 100644 --- a/.cz.json +++ b/.cz.json @@ -3,6 +3,19 @@ "name": "cz_conventional_commits", "tag_format": "v$version", "version_scheme": "semver2", - "version": "4.6.2" + "version": "4.6.2", + "encoding": "utf-8", + "style": [ + ["qmark", "fg:#ff9d00 bold"], + ["question", "bold"], + ["answer", "fg:#ff9d00 bold"], + ["pointer", "fg:#ff9d00 bold"], + ["highlighted", "fg:#ff9d00 bold"], + ["selected", "fg:#cc5454"], + ["separator", "fg:#cc5454"], + ["instruction", ""], + ["text", ""], + ["disabled", "fg:#858585 italic"] + ] } } From a7d1272194e8bc88af3f4f0b121b37f01be6362a Mon Sep 17 00:00:00 2001 From: Pia B Date: Thu, 2 Jul 2026 10:57:31 +0200 Subject: [PATCH 03/13] test(commitizen): adding something to test changelog creation --- NEWCHANGELOG.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 NEWCHANGELOG.md diff --git a/NEWCHANGELOG.md b/NEWCHANGELOG.md new file mode 100644 index 00000000000..420e6f23d0e --- /dev/null +++ b/NEWCHANGELOG.md @@ -0,0 +1 @@ +# Change Log From dc7343e396ec068acd91222cb55d19518620739a Mon Sep 17 00:00:00 2001 From: Pia B Date: Thu, 2 Jul 2026 11:04:40 +0200 Subject: [PATCH 04/13] docs(changelog): add changelog of local changes --- CHANGELOG.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a32b140659..de70c6880df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,26 @@ +#### 2026-07-02 + +##### New Features + +- **commitizen:** add standard commitizen config ([3517a4f0](https://github.com/mastodon/mastodon/commit/3517a4f0ed759c5891c547e82e24bd3474280b55)) + +##### Bug Fixes + +- Ignore non-http/https protocols in Service Worker handleFetch ([#39507](https://github.com/mastodon/mastodon/pull/39507)) ([7a635efd](https://github.com/mastodon/mastodon/commit/7a635efdc27d52f66f4d1eb379dd64a19067aeaa)) + +##### Other Changes + +- Fix attempted modification of frozen hash ([#39571](https://github.com/mastodon/mastodon/pull/39571)) ([761c61b4](https://github.com/mastodon/mastodon/commit/761c61b42590a2fd91442fc15a0a7583e48bbea4)) +- Add back to state ([#39402](https://github.com/mastodon/mastodon/pull/39402)) ([963a5466](https://github.com/mastodon/mastodon/commit/963a54664804e60ea8e30795090a0f20de7a48dc)) + +##### Refactors + +- Typing statuses ([#39374](https://github.com/mastodon/mastodon/pull/39374)) ([a7e80c62](https://github.com/mastodon/mastodon/commit/a7e80c62615233a305fdb9f39e1e0451f04e987f)) + +##### Tests + +- **commitizen:** adding something to test changelog creation ([a7d12721](https://github.com/mastodon/mastodon/commit/a7d1272194e8bc88af3f4f0b121b37f01be6362a)) + # Changelog All notable changes to this project will be documented in this file. From 8c2bb23fa59cb44ea87a620ef9ff357948fd9b34 Mon Sep 17 00:00:00 2001 From: Pia B Date: Thu, 2 Jul 2026 15:46:54 +0200 Subject: [PATCH 05/13] feat: cliff config that matches our old commits --- cliff.toml | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 cliff.toml diff --git a/cliff.toml b/cliff.toml new file mode 100644 index 00000000000..975e90b5069 --- /dev/null +++ b/cliff.toml @@ -0,0 +1,106 @@ +# git-cliff ~ configuration file +# https://git-cliff.org/docs/configuration + + +[changelog] +# A Tera template to be rendered for each release in the changelog. +# See https://keats.github.io/tera/docs/#introduction +# discard duplicate commits +# {% for commit in commits | unique(attribute="message") %}, +# filter merge commits +# {% for group, commits in commits | filter(attribute="merge_commit", value=false) | group_by(attribute="group") %}, +# strip tags +# {{ group | striptags | trim | upper_first }} +body = """ +{% if version %}\ + ## [{{ version }}] - {{ timestamp | date(format="%Y-%m-%d") }} +{% else %}\ + ## [unreleased] +{% endif %}\ +{% for group, commits in commits | filter(attribute="merge_commit", value=false) | group_by(attribute="group") %} + ### {{ group | striptags | trim | upper_first }} + {% for commit in commits | unique(attribute="message") %} + - {% if commit.scope %}*({{ commit.scope }})* {% endif %}\ + {% if commit.breaking %}[**breaking**] {% endif %}\ + {{ commit.message | split(pat="Co-authored-by:") | first | split(pat="Signed-off-by:") | first | trim | upper_first }}\ + {% endfor %} +{% endfor %} +""" + +# Remove leading and trailing whitespaces from the changelog's body. +trim = true +# Render body even when there are no releases to process. +render_always = true +# An array of regex based postprocessors to modify the changelog. +postprocessors = [ + # Replace the placeholder with a URL. + #{ pattern = '', replace = "https://github.com/orhun/git-cliff" }, +] +# render body even when there are no releases to process +# render_always = true +# output file path +output = "test.md" + +[git] +# Parse commits according to the conventional commits specification. +# See https://www.conventionalcommits.org +conventional_commits = true +# Exclude commits that do not match the conventional commits specification. +filter_unconventional = false +# Require all commits to be conventional. +# Takes precedence over filter_unconventional. +require_conventional = false +# Split commits on newlines, treating each line as an individual commit. +split_commits = false +# An array of regex based parsers to modify commit messages prior to further processing. +commit_preprocessors = [ + # Replace issue numbers with link templates to be updated in `changelog.postprocessors`. + #{ pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](/issues/${2}))"}, + # Check spelling of the commit message using https://github.com/crate-ci/typos. + # If the spelling is incorrect, it will be fixed automatically. + #{ pattern = '.*', replace_command = 'typos --write-changes -' }, +] +# Prevent commits that are breaking from being excluded by commit parsers. +protect_breaking_commits = true +# An array of regex based parsers for extracting data from the commit message. +# Assigns commits to groups. +# Optionally sets the commit's scope and can decide to exclude commits from further processing. +commit_parsers = [ + { message = "(?i)^refactor", skip = true }, + { message = "^chore\\(release\\): prepare for", skip = true }, + { message = "^chore\\(deps.*\\)", skip = true }, + { message = "^chore\\(pr\\)", skip = true }, + { message = "^chore\\(pull\\)", skip = true }, + { message = "^New Crowdin Translations", skip = true }, + { message = "(?i)^add", group = "๐Ÿš€ Features" }, + { message = "(?i)^feat", group = "๐Ÿš€ Features" }, + { message = "(?i)^fix", group = "๐Ÿ› Bug Fixes" }, + { message = "^doc", group = "๐Ÿ“š Documentation" }, + { message = "^perf", group = "โšก Performance" }, + { message = "^style", group = "๐ŸŽจ Styling" }, + { message = "^test", group = "๐Ÿงช Testing" }, + { message = "^chore|^ci", group = "โš™๏ธ Miscellaneous Tasks" }, + { body = ".*security", group = "๐Ÿ›ก๏ธ Security" }, + { message = "(?i)^revert", group = "โ—€๏ธ Revert" }, + { message = "(?i)^update|(?i)^new|(?i)^bump", group = " dependency update" }, + { message = ".*", group = "๐Ÿ’ผ Other" }, +] +# Exclude commits that are not matched by any commit parser. +filter_commits = false +skip_tags = "" +# Fail on a commit that is not matched by any commit parser. +fail_on_unmatched_commit = false +# An array of link parsers for extracting external references, and turning them into URLs, using regex. +link_parsers = [] +tag_pattern = "v[0-9].*" +# Include only the tags that belong to the current branch. +use_branch_tags = false +# Order releases topologically instead of chronologically. +topo_order = false +# Order commits topologically instead of chronologically. +topo_order_commits = true +# Order of commits in each group/release within the changelog. +# Allowed values: newest, oldest +sort_commits = "oldest" +# Process submodules commits +recurse_submodules = false From 33082c03deb71e683b9651527f8118ef09b3b3d8 Mon Sep 17 00:00:00 2001 From: Pia B Date: Thu, 2 Jul 2026 17:57:00 +0200 Subject: [PATCH 06/13] change cliff config, undo changelog changes --- CHANGELOG.md | 23 -------------------- cliff.toml | 59 +++++++++++++++++++++++++++++++++++++++------------- test.md | 17 +++++++++++++++ 3 files changed, 61 insertions(+), 38 deletions(-) create mode 100644 test.md diff --git a/CHANGELOG.md b/CHANGELOG.md index de70c6880df..0a32b140659 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,26 +1,3 @@ -#### 2026-07-02 - -##### New Features - -- **commitizen:** add standard commitizen config ([3517a4f0](https://github.com/mastodon/mastodon/commit/3517a4f0ed759c5891c547e82e24bd3474280b55)) - -##### Bug Fixes - -- Ignore non-http/https protocols in Service Worker handleFetch ([#39507](https://github.com/mastodon/mastodon/pull/39507)) ([7a635efd](https://github.com/mastodon/mastodon/commit/7a635efdc27d52f66f4d1eb379dd64a19067aeaa)) - -##### Other Changes - -- Fix attempted modification of frozen hash ([#39571](https://github.com/mastodon/mastodon/pull/39571)) ([761c61b4](https://github.com/mastodon/mastodon/commit/761c61b42590a2fd91442fc15a0a7583e48bbea4)) -- Add back to state ([#39402](https://github.com/mastodon/mastodon/pull/39402)) ([963a5466](https://github.com/mastodon/mastodon/commit/963a54664804e60ea8e30795090a0f20de7a48dc)) - -##### Refactors - -- Typing statuses ([#39374](https://github.com/mastodon/mastodon/pull/39374)) ([a7e80c62](https://github.com/mastodon/mastodon/commit/a7e80c62615233a305fdb9f39e1e0451f04e987f)) - -##### Tests - -- **commitizen:** adding something to test changelog creation ([a7d12721](https://github.com/mastodon/mastodon/commit/a7d1272194e8bc88af3f4f0b121b37f01be6362a)) - # Changelog All notable changes to this project will be documented in this file. diff --git a/cliff.toml b/cliff.toml index 975e90b5069..e6607b7a4eb 100644 --- a/cliff.toml +++ b/cliff.toml @@ -1,5 +1,7 @@ # git-cliff ~ configuration file # https://git-cliff.org/docs/configuration +# +# [changelog] @@ -11,6 +13,8 @@ # {% for group, commits in commits | filter(attribute="merge_commit", value=false) | group_by(attribute="group") %}, # strip tags # {{ group | striptags | trim | upper_first }} +# when we integrate it with github we can also get the userhandles like following +# {%- if commit.remote.username -%} (by @{{ commit.remote.username }}){%- endif -%}\ body = """ {% if version %}\ ## [{{ version }}] - {{ timestamp | date(format="%Y-%m-%d") }} @@ -23,14 +27,34 @@ body = """ - {% if commit.scope %}*({{ commit.scope }})* {% endif %}\ {% if commit.breaking %}[**breaking**] {% endif %}\ {{ commit.message | split(pat="Co-authored-by:") | first | split(pat="Signed-off-by:") | first | trim | upper_first }}\ + {%- if commit.author.name -%} (by @{{ commit.author.name }}){%- endif -%}\ {% endfor %} {% endfor %} """ +# A Tera template to be rendered as the changelog's footer. +# See https://keats.github.io/tera/docs/#introduction +footer = """ +{% for release in releases -%} + {% if release.version -%} + {% if release.previous.version -%} + [{{ release.version | trim_start_matches(pat="v") }}]: \ + https://github.com/{{ remote.github.owner }}/{{ remote.github.repo }}\ + /compare/{{ release.previous.version }}..{{ release.version }} + {% else -%} + [{{ release.version | trim_start_matches(pat="v") }}]: \ + https://github.com/{{ remote.github.owner }}/{{ remote.github.repo }}\ + /tree/{{ release.version }} + {% endif -%} + {% else -%} + [unreleased]: https://github.com/{{ remote.github.owner }}/{{ remote.github.repo }}\ + /compare/{{ release.previous.version }}..HEAD + {% endif -%} +{% endfor %} + +""" # Remove leading and trailing whitespaces from the changelog's body. trim = true -# Render body even when there are no releases to process. -render_always = true # An array of regex based postprocessors to modify the changelog. postprocessors = [ # Replace the placeholder with a URL. @@ -72,22 +96,27 @@ commit_parsers = [ { message = "^chore\\(pr\\)", skip = true }, { message = "^chore\\(pull\\)", skip = true }, { message = "^New Crowdin Translations", skip = true }, - { message = "(?i)^add", group = "๐Ÿš€ Features" }, - { message = "(?i)^feat", group = "๐Ÿš€ Features" }, - { message = "(?i)^fix", group = "๐Ÿ› Bug Fixes" }, - { message = "^doc", group = "๐Ÿ“š Documentation" }, - { message = "^perf", group = "โšก Performance" }, - { message = "^style", group = "๐ŸŽจ Styling" }, - { message = "^test", group = "๐Ÿงช Testing" }, - { message = "^chore|^ci", group = "โš™๏ธ Miscellaneous Tasks" }, - { body = ".*security", group = "๐Ÿ›ก๏ธ Security" }, - { message = "(?i)^revert", group = "โ—€๏ธ Revert" }, - { message = "(?i)^update|(?i)^new|(?i)^bump", group = " dependency update" }, - { message = ".*", group = "๐Ÿ’ผ Other" }, + { message = "(?i)^update|(?i)^bump", skip = true }, + { message = "(?i)^add", group = "Added" }, + { message = "(?i)^feat", group = "Added" }, + { message = "(?i)^change", group = "Changed" }, + { message = "(?i)^fix", group = "Fixed" }, + { message = "(?i)^deprecate", group = "Deprecated" }, + { message = "(?i)^remove", group = "Removed" }, + { message = "^doc", group = "Changed" }, + { message = "^perf", group = "Changed" }, + { message = "^style", group = "Changed" }, + { message = "^test", group = "Changed" }, + { body = ".*security", group = "Security" }, + { message = ".*", group = "Other" }, + # we can also sort by PR labels, if this is easier + # like { field = "github.pr_labels", pattern = "bug", group = "Fixed" }, + # or group renovate PRs + # { field = "author.name", pattern = "renovate\\[bot\\]", group = "Dependency Updates"}, ] # Exclude commits that are not matched by any commit parser. filter_commits = false -skip_tags = "" +skip_tags = "4.6.0-rc.1" # Fail on a commit that is not matched by any commit parser. fail_on_unmatched_commit = false # An array of link parsers for extracting external references, and turning them into URLs, using regex. diff --git a/test.md b/test.md new file mode 100644 index 00000000000..d67e4662408 --- /dev/null +++ b/test.md @@ -0,0 +1,17 @@ +## [unreleased] + +### Added + +- Add commitizen changellog tool(by @Pia B) +- _(commitizen)_ Add standard commitizen config(by @Pia B) +- Cliff config that matches our old commits(by @Pia B) + +### Changed + +- _(commitizen)_ Adding something to test changelog creation(by @Pia B) +- _(changelog)_ Add changelog of local changes(by @Pia B) + +### Fixed + +- Fix broken `StatusQuoteManager` stories (#39678)(by @diondiondion) +- Fix duplicate "clear" button shown in main search input in Chrome (#39679)(by @diondiondion) From df0ee5bc6f111acbdd8e4856685a14e95c16e15b Mon Sep 17 00:00:00 2001 From: Pia B Date: Fri, 3 Jul 2026 14:46:43 +0200 Subject: [PATCH 07/13] remove footer from cliff config and indent by 2 --- NEWCHANGELOG.md | 1 - cliff.toml | 58 ++++++++++++++++++++++++------------------------- test.md | 8 +++++++ 3 files changed, 36 insertions(+), 31 deletions(-) delete mode 100644 NEWCHANGELOG.md diff --git a/NEWCHANGELOG.md b/NEWCHANGELOG.md deleted file mode 100644 index 420e6f23d0e..00000000000 --- a/NEWCHANGELOG.md +++ /dev/null @@ -1 +0,0 @@ -# Change Log diff --git a/cliff.toml b/cliff.toml index e6607b7a4eb..f71f5ac18ab 100644 --- a/cliff.toml +++ b/cliff.toml @@ -1,7 +1,5 @@ # git-cliff ~ configuration file # https://git-cliff.org/docs/configuration -# -# [changelog] @@ -17,41 +15,41 @@ # {%- if commit.remote.username -%} (by @{{ commit.remote.username }}){%- endif -%}\ body = """ {% if version %}\ - ## [{{ version }}] - {{ timestamp | date(format="%Y-%m-%d") }} + ## [{{ version }}] - {{ timestamp | date(format="%Y-%m-%d") }} {% else %}\ - ## [unreleased] + ## [unreleased] {% endif %}\ {% for group, commits in commits | filter(attribute="merge_commit", value=false) | group_by(attribute="group") %} - ### {{ group | striptags | trim | upper_first }} - {% for commit in commits | unique(attribute="message") %} - - {% if commit.scope %}*({{ commit.scope }})* {% endif %}\ - {% if commit.breaking %}[**breaking**] {% endif %}\ - {{ commit.message | split(pat="Co-authored-by:") | first | split(pat="Signed-off-by:") | first | trim | upper_first }}\ - {%- if commit.author.name -%} (by @{{ commit.author.name }}){%- endif -%}\ - {% endfor %} + ### {{ group | striptags | trim | upper_first }} + {% for commit in commits | unique(attribute="message") %} + - {% if commit.scope %}*({{ commit.scope }})* {% endif %}\ + {% if commit.breaking %}[**breaking**] {% endif %}\ + {{ commit.message | split(pat="Co-authored-by:") | first | split(pat="Signed-off-by:") | first | trim | upper_first }}\ + {%- if commit.author.name -%} (by @{{ commit.author.name }}){%- endif -%}\ + {% endfor %} {% endfor %} """ # A Tera template to be rendered as the changelog's footer. # See https://keats.github.io/tera/docs/#introduction -footer = """ -{% for release in releases -%} - {% if release.version -%} - {% if release.previous.version -%} - [{{ release.version | trim_start_matches(pat="v") }}]: \ - https://github.com/{{ remote.github.owner }}/{{ remote.github.repo }}\ - /compare/{{ release.previous.version }}..{{ release.version }} - {% else -%} - [{{ release.version | trim_start_matches(pat="v") }}]: \ - https://github.com/{{ remote.github.owner }}/{{ remote.github.repo }}\ - /tree/{{ release.version }} - {% endif -%} - {% else -%} - [unreleased]: https://github.com/{{ remote.github.owner }}/{{ remote.github.repo }}\ - /compare/{{ release.previous.version }}..HEAD - {% endif -%} -{% endfor %} - -""" +# footer = """ +# {% for release in releases -%} +# {% if release.version -%} +# {% if release.previous.version -%} +# [{{ release.version | trim_start_matches(pat="v") }}]: \ +# https://github.com/{{ remote.github.owner }}/{{ remote.github.repo }}\ +# /compare/{{ release.previous.version }}..{{ release.version }} +# {% else -%} +# [{{ release.version }}]: \ +# https://github.com/{{ remote.github.owner }}/{{ remote.github.repo }}\ +# /tree/{{ release.version }} +# {% endif -%} +# {% else -%} +# [unreleased]: https://github.com/{{ remote.github.owner }}/{{ remote.github.repo }}\ +# /compare/{{ release.previous.version }}..HEAD +# {% endif -%} +# {% endfor %} +# +# """ # Remove leading and trailing whitespaces from the changelog's body. trim = true diff --git a/test.md b/test.md index d67e4662408..44947a6f033 100644 --- a/test.md +++ b/test.md @@ -2,6 +2,8 @@ ### Added +- Add audit logs for Hashtags (#39337)(by @Pia B.) +- Add Json schema validation for action logs (#39670)(by @Pia B.) - Add commitizen changellog tool(by @Pia B) - _(commitizen)_ Add standard commitizen config(by @Pia B) - Cliff config that matches our old commits(by @Pia B) @@ -10,8 +12,14 @@ - _(commitizen)_ Adding something to test changelog creation(by @Pia B) - _(changelog)_ Add changelog of local changes(by @Pia B) +- Change cliff config, undo changelog changes(by @Pia B) ### Fixed +- Fix visual glitch with the spoiler button (#39677)(by @Echo) - Fix broken `StatusQuoteManager` stories (#39678)(by @diondiondion) - Fix duplicate "clear" button shown in main search input in Chrome (#39679)(by @diondiondion) + +### Other + +- Attachment stories (#39661)(by @Echo) From eff99b878acbf5774956cfff1a9c1204c7cecbdb Mon Sep 17 00:00:00 2001 From: Pia B Date: Tue, 7 Jul 2026 12:10:03 +0200 Subject: [PATCH 08/13] remove commitizen config --- .cz.json | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 .cz.json diff --git a/.cz.json b/.cz.json deleted file mode 100644 index f68f5022ac0..00000000000 --- a/.cz.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "commitizen": { - "name": "cz_conventional_commits", - "tag_format": "v$version", - "version_scheme": "semver2", - "version": "4.6.2", - "encoding": "utf-8", - "style": [ - ["qmark", "fg:#ff9d00 bold"], - ["question", "bold"], - ["answer", "fg:#ff9d00 bold"], - ["pointer", "fg:#ff9d00 bold"], - ["highlighted", "fg:#ff9d00 bold"], - ["selected", "fg:#cc5454"], - ["separator", "fg:#cc5454"], - ["instruction", ""], - ["text", ""], - ["disabled", "fg:#858585 italic"] - ] - } -} From b0378eaaecb69718c8f142fab71199fea81e5223 Mon Sep 17 00:00:00 2001 From: Pia B Date: Tue, 7 Jul 2026 15:23:42 +0200 Subject: [PATCH 09/13] add commit sha of last included commit to the top --- cliff.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cliff.toml b/cliff.toml index f71f5ac18ab..da756bc5a6a 100644 --- a/cliff.toml +++ b/cliff.toml @@ -14,6 +14,9 @@ # when we integrate it with github we can also get the userhandles like following # {%- if commit.remote.username -%} (by @{{ commit.remote.username }}){%- endif -%}\ body = """ +{% if commit_range %} + ## last included commit {{ commit_range.to | truncate(length=10, end="") }} +{% endif %}\ {% if version %}\ ## [{{ version }}] - {{ timestamp | date(format="%Y-%m-%d") }} {% else %}\ From 7c2866c601d4ff413e2e60e35fe6ced02a0301de Mon Sep 17 00:00:00 2001 From: Pia B Date: Tue, 7 Jul 2026 15:35:07 +0200 Subject: [PATCH 10/13] security use this keyword for test reasons --- test.md | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/test.md b/test.md index 44947a6f033..3351c1e244c 100644 --- a/test.md +++ b/test.md @@ -1,7 +1,4 @@ -## [unreleased] - -### Added - +- Add dark mode to storybook (#39656)(by @Echo) - Add audit logs for Hashtags (#39337)(by @Pia B.) - Add Json schema validation for action logs (#39670)(by @Pia B.) - Add commitizen changellog tool(by @Pia B) @@ -10,16 +7,28 @@ ### Changed +- Change how URIs are stored for local keypairs (#39658)(by @Claire) - _(commitizen)_ Adding something to test changelog creation(by @Pia B) - _(changelog)_ Add changelog of local changes(by @Pia B) - Change cliff config, undo changelog changes(by @Pia B) ### Fixed +- Fix follow button floating on profiles when overview landing page is enabled (#39650)(by @Federico Franco) +- Fix tootctl media lookup fails on local media URLs (#39615)(by @Brook Miles) +- Fix encryption warning "read more" link (#39635)(by @Thomas Pike) +- Fix invisible username during post highlight animation (#39659)(by @diondiondion) +- Fix missing unique index on keypairs URI (#39668)(by @Claire) - Fix visual glitch with the spoiler button (#39677)(by @Echo) - Fix broken `StatusQuoteManager` stories (#39678)(by @diondiondion) - Fix duplicate "clear" button shown in main search input in Chrome (#39679)(by @diondiondion) ### Other +- Testing and types updates (#39657)(by @Echo) - Attachment stories (#39661)(by @Echo) + +### Removed + +- Remove footer from cliff config and indent by 2(by @Pia B) +- Remove commitizen config(by @Pia B) From 30ab5a6df831a13ce441ea43f9ea904094b8515b Mon Sep 17 00:00:00 2001 From: Pia B Date: Tue, 7 Jul 2026 15:58:19 +0200 Subject: [PATCH 11/13] adjust order of changelog categories --- cliff.toml | 27 ++++++++++++++------------- test.md | 34 ---------------------------------- unreleased.md | 30 ++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 47 deletions(-) delete mode 100644 test.md create mode 100644 unreleased.md diff --git a/cliff.toml b/cliff.toml index da756bc5a6a..4f05025982d 100644 --- a/cliff.toml +++ b/cliff.toml @@ -64,7 +64,7 @@ postprocessors = [ # render body even when there are no releases to process # render_always = true # output file path -output = "test.md" +output = "unreleased.md" [git] # Parse commits according to the conventional commits specification. @@ -98,18 +98,19 @@ commit_parsers = [ { message = "^chore\\(pull\\)", skip = true }, { message = "^New Crowdin Translations", skip = true }, { message = "(?i)^update|(?i)^bump", skip = true }, - { message = "(?i)^add", group = "Added" }, - { message = "(?i)^feat", group = "Added" }, - { message = "(?i)^change", group = "Changed" }, - { message = "(?i)^fix", group = "Fixed" }, - { message = "(?i)^deprecate", group = "Deprecated" }, - { message = "(?i)^remove", group = "Removed" }, - { message = "^doc", group = "Changed" }, - { message = "^perf", group = "Changed" }, - { message = "^style", group = "Changed" }, - { message = "^test", group = "Changed" }, - { body = ".*security", group = "Security" }, - { message = ".*", group = "Other" }, + { message = "(?i)^add", group = "Added" }, + { message = "(?i)^feat", group = "Added" }, + { message = "(?i)^change", group = "Changed" }, + { message = "(?i)^fix", group = "Fixed" }, + { message = "(?i)^deprecate", group = "Deprecated" }, + { message = "(?i)^remove", group = "Removed" }, + { message = "^doc", group = "Changed" }, + { message = "^perf", group = "Changed" }, + { message = "^style", group = "Changed" }, + { message = "^test", group = "Changed" }, + { message = "^security", group = "Security" }, + { body = ".*security", group = "Security" }, + { message = ".*", group = "Other" }, # we can also sort by PR labels, if this is easier # like { field = "github.pr_labels", pattern = "bug", group = "Fixed" }, # or group renovate PRs diff --git a/test.md b/test.md deleted file mode 100644 index 3351c1e244c..00000000000 --- a/test.md +++ /dev/null @@ -1,34 +0,0 @@ -- Add dark mode to storybook (#39656)(by @Echo) -- Add audit logs for Hashtags (#39337)(by @Pia B.) -- Add Json schema validation for action logs (#39670)(by @Pia B.) -- Add commitizen changellog tool(by @Pia B) -- _(commitizen)_ Add standard commitizen config(by @Pia B) -- Cliff config that matches our old commits(by @Pia B) - -### Changed - -- Change how URIs are stored for local keypairs (#39658)(by @Claire) -- _(commitizen)_ Adding something to test changelog creation(by @Pia B) -- _(changelog)_ Add changelog of local changes(by @Pia B) -- Change cliff config, undo changelog changes(by @Pia B) - -### Fixed - -- Fix follow button floating on profiles when overview landing page is enabled (#39650)(by @Federico Franco) -- Fix tootctl media lookup fails on local media URLs (#39615)(by @Brook Miles) -- Fix encryption warning "read more" link (#39635)(by @Thomas Pike) -- Fix invisible username during post highlight animation (#39659)(by @diondiondion) -- Fix missing unique index on keypairs URI (#39668)(by @Claire) -- Fix visual glitch with the spoiler button (#39677)(by @Echo) -- Fix broken `StatusQuoteManager` stories (#39678)(by @diondiondion) -- Fix duplicate "clear" button shown in main search input in Chrome (#39679)(by @diondiondion) - -### Other - -- Testing and types updates (#39657)(by @Echo) -- Attachment stories (#39661)(by @Echo) - -### Removed - -- Remove footer from cliff config and indent by 2(by @Pia B) -- Remove commitizen config(by @Pia B) diff --git a/unreleased.md b/unreleased.md new file mode 100644 index 00000000000..56f7bf5a3d9 --- /dev/null +++ b/unreleased.md @@ -0,0 +1,30 @@ +## last included commit 7c2866c601 + +## [unreleased] + +### Security + +- Security use this keyword for test reasons(by @Pia B) + +### Added + +- Add commitizen changellog tool(by @Pia B) +- _(commitizen)_ Add standard commitizen config(by @Pia B) +- Cliff config that matches our old commits(by @Pia B) +- Add commit sha of last included commit to the top(by @Pia B) + +### Fixed + +- Fix broken `StatusQuoteManager` stories (#39678)(by @diondiondion) +- Fix duplicate "clear" button shown in main search input in Chrome (#39679)(by @diondiondion) + +### Changed + +- _(commitizen)_ Adding something to test changelog creation(by @Pia B) +- _(changelog)_ Add changelog of local changes(by @Pia B) +- Change cliff config, undo changelog changes(by @Pia B) + +### Removed + +- Remove footer from cliff config and indent by 2(by @Pia B) +- Remove commitizen config(by @Pia B) From 9fa8b98a547dd7bf5405a539f1b98df3dcbd85da Mon Sep 17 00:00:00 2001 From: Pia B Date: Tue, 7 Jul 2026 15:59:45 +0200 Subject: [PATCH 12/13] remove the matcher I added for test reasons --- cliff.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/cliff.toml b/cliff.toml index 4f05025982d..7206d525040 100644 --- a/cliff.toml +++ b/cliff.toml @@ -108,7 +108,6 @@ commit_parsers = [ { message = "^perf", group = "Changed" }, { message = "^style", group = "Changed" }, { message = "^test", group = "Changed" }, - { message = "^security", group = "Security" }, { body = ".*security", group = "Security" }, { message = ".*", group = "Other" }, # we can also sort by PR labels, if this is easier From ff1dc5c24edccdb0bfd9693e9a104171b52df0f5 Mon Sep 17 00:00:00 2001 From: Pia B Date: Mon, 20 Jul 2026 18:52:31 +0200 Subject: [PATCH 13/13] remove demo changelog --- unreleased.md | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 unreleased.md diff --git a/unreleased.md b/unreleased.md deleted file mode 100644 index 56f7bf5a3d9..00000000000 --- a/unreleased.md +++ /dev/null @@ -1,30 +0,0 @@ -## last included commit 7c2866c601 - -## [unreleased] - -### Security - -- Security use this keyword for test reasons(by @Pia B) - -### Added - -- Add commitizen changellog tool(by @Pia B) -- _(commitizen)_ Add standard commitizen config(by @Pia B) -- Cliff config that matches our old commits(by @Pia B) -- Add commit sha of last included commit to the top(by @Pia B) - -### Fixed - -- Fix broken `StatusQuoteManager` stories (#39678)(by @diondiondion) -- Fix duplicate "clear" button shown in main search input in Chrome (#39679)(by @diondiondion) - -### Changed - -- _(commitizen)_ Adding something to test changelog creation(by @Pia B) -- _(changelog)_ Add changelog of local changes(by @Pia B) -- Change cliff config, undo changelog changes(by @Pia B) - -### Removed - -- Remove footer from cliff config and indent by 2(by @Pia B) -- Remove commitizen config(by @Pia B)