From c1e3d5ab3ea40f2e57453f66954afb5c93c0540a Mon Sep 17 00:00:00 2001 From: Thomas Zerr Date: Fri, 5 Jul 2024 13:28:57 +0200 Subject: [PATCH] Adjust changelog for release 3.3.0 --- CHANGELOG.md | 16 ++++++++++++++++ gradle/changelog/external_merge_tools.yml | 2 -- gradle/changelog/manual_pullrequest_help.yml | 2 -- gradle/changelog/namespace_permissions.yaml | 2 -- gradle/changelog/new_details_icon.yml | 2 -- .../changelog/notification_external_system.yml | 2 -- gradle/changelog/resilient_trace_exporter.yaml | 2 -- gradle/empty_file_diff.yml | 2 -- 8 files changed, 16 insertions(+), 14 deletions(-) delete mode 100644 gradle/changelog/external_merge_tools.yml delete mode 100644 gradle/changelog/manual_pullrequest_help.yml delete mode 100644 gradle/changelog/namespace_permissions.yaml delete mode 100644 gradle/changelog/new_details_icon.yml delete mode 100644 gradle/changelog/notification_external_system.yml delete mode 100644 gradle/changelog/resilient_trace_exporter.yaml delete mode 100644 gradle/empty_file_diff.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cc98f7a13..4e49d0e853 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,21 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [3.3.0] - 2024-07-05 +### Added +- Check for external merge tools during merge +- Notification when external user management is activated during user creation + +### Fixed +- Prevent hiding the whole inner content container if an diff is empty. +- Makes the trace exporter resilient against errors in plugins + +### Changed +- Using different icon for commit details button + +### Security +- Privilege escalation in namespaces + ## [3.2.2] - 2024-06-24 ### Added - Written offer as a text file in all distributions @@ -1563,3 +1578,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [3.2.0]: https://scm-manager.org/download/3.2.0 [3.2.1]: https://scm-manager.org/download/3.2.1 [3.2.2]: https://scm-manager.org/download/3.2.2 +[3.3.0]: https://scm-manager.org/download/3.3.0 diff --git a/gradle/changelog/external_merge_tools.yml b/gradle/changelog/external_merge_tools.yml deleted file mode 100644 index abb526faa8..0000000000 --- a/gradle/changelog/external_merge_tools.yml +++ /dev/null @@ -1,2 +0,0 @@ -- type: added - description: Check for external merge tools during merge diff --git a/gradle/changelog/manual_pullrequest_help.yml b/gradle/changelog/manual_pullrequest_help.yml deleted file mode 100644 index ff576ff109..0000000000 --- a/gradle/changelog/manual_pullrequest_help.yml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Description to be more helpful diff --git a/gradle/changelog/namespace_permissions.yaml b/gradle/changelog/namespace_permissions.yaml deleted file mode 100644 index d4d5a28a10..0000000000 --- a/gradle/changelog/namespace_permissions.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: security - description: Privilege escalation in namespaces diff --git a/gradle/changelog/new_details_icon.yml b/gradle/changelog/new_details_icon.yml deleted file mode 100644 index e301ca8888..0000000000 --- a/gradle/changelog/new_details_icon.yml +++ /dev/null @@ -1,2 +0,0 @@ -- type: changed - description: Using different icon for commit details button diff --git a/gradle/changelog/notification_external_system.yml b/gradle/changelog/notification_external_system.yml deleted file mode 100644 index 8669afeb99..0000000000 --- a/gradle/changelog/notification_external_system.yml +++ /dev/null @@ -1,2 +0,0 @@ -- type: added - description: Notification when external user management is activated during user creation diff --git a/gradle/changelog/resilient_trace_exporter.yaml b/gradle/changelog/resilient_trace_exporter.yaml deleted file mode 100644 index 1dc034b6bc..0000000000 --- a/gradle/changelog/resilient_trace_exporter.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Makes the trace exporter resilient against errors in plugins diff --git a/gradle/empty_file_diff.yml b/gradle/empty_file_diff.yml deleted file mode 100644 index 8d52309bf9..0000000000 --- a/gradle/empty_file_diff.yml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Prevent hiding the whole inner content container if an diff is empty.