From 0611cd40987493f4398b5246b232def8fc7d3e6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 21 Jan 2022 15:58:19 +0100 Subject: [PATCH] Adjust changelog for release 2.30.0 --- CHANGELOG.md | 18 ++++++++++++- docs/en/release-process.md | 26 ++++++------------- gradle/changelog/alerts.yaml | 2 -- gradle/changelog/autocomplete_namespaces.yaml | 2 -- gradle/changelog/autocomplete_sorted.yaml | 2 -- gradle/changelog/compare.yaml | 2 -- gradle/changelog/encrypt_myc_token.yaml | 2 -- .../changelog/fix_unit_tests_on_windows.yaml | 2 -- .../changelog/init_git_head_on_creation.yaml | 2 -- .../changelog/keep_user_group_selection.yaml | 2 -- gradle/changelog/modal-focus.yaml | 2 -- 11 files changed, 25 insertions(+), 37 deletions(-) delete mode 100644 gradle/changelog/alerts.yaml delete mode 100644 gradle/changelog/autocomplete_namespaces.yaml delete mode 100644 gradle/changelog/autocomplete_sorted.yaml delete mode 100644 gradle/changelog/compare.yaml delete mode 100644 gradle/changelog/encrypt_myc_token.yaml delete mode 100644 gradle/changelog/fix_unit_tests_on_windows.yaml delete mode 100644 gradle/changelog/init_git_head_on_creation.yaml delete mode 100644 gradle/changelog/keep_user_group_selection.yaml delete mode 100644 gradle/changelog/modal-focus.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index d0c57995fe..ec7183da32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,22 @@ 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). +## [2.30.0] - 2022-01-21 +### Added +- initial focus, submission on pressing enter and fix trap focus for modals ([#1925](https://github.com/scm-manager/scm-manager/pull/1925)) +- Add compare view to see changes between branches, tags and revisions ([#1920](https://github.com/scm-manager/scm-manager/pull/1920)) +- Security notifications to inform the running instance about known security issues ([#1924](https://github.com/scm-manager/scm-manager/pull/1924)) + +### Fixed +- Set HEAD to correct branch in new git repositories ([#1929](https://github.com/scm-manager/scm-manager/pull/1929)) +- Fix bugs in unit tests which occur on Windows only ([#1927](https://github.com/scm-manager/scm-manager/pull/1927)) +- Encrypt myCloudogu refresh token on file system ([#1923](https://github.com/scm-manager/scm-manager/pull/1923)) +- Autocompletion has sorted suggestions ([#1918](https://github.com/scm-manager/scm-manager/pull/1918)) + +### Changed +- Keeps the selection whether to add a user or a group in the repository permission dialog ([#1919](https://github.com/scm-manager/scm-manager/pull/1919)) +- Autocompletion for namespaces ([#1916](https://github.com/scm-manager/scm-manager/pull/1916)) + ## [2.29.1] - 2022-01-17 ### Fixed - Path traversal vulnerability @@ -909,4 +925,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [2.28.0]: https://scm-manager.org/download/2.28.0 [2.29.0]: https://scm-manager.org/download/2.29.0 [2.29.1]: https://scm-manager.org/download/2.29.1 - +[2.30.0]: https://scm-manager.org/download/2.30.0 diff --git a/docs/en/release-process.md b/docs/en/release-process.md index dc46da53d2..cfcf2a2982 100644 --- a/docs/en/release-process.md +++ b/docs/en/release-process.md @@ -26,7 +26,8 @@ All unreleased changes are stored in the `gradle/changelog` directory. The changelog can be updated with the `updateChangelog` gradle task. ```bash -./gradlew :updateChangelog --release= +export VERSION= \ +&& ./gradlew :updateChangelog --release=$VERSION ``` Now we should manually check if the changelog looks good. @@ -37,27 +38,16 @@ git diff CHANGELOG.md If everything looks fine, we can remove the changelog directory. -```bash -rm -rf gradle/changelog -``` - -## Create release branch +## Create release branch, commit changes and push ```bash -git checkout -b release/ +git rm -rf gradle/changelog \ +&& git checkout -b release/$VERSION \ +&& git add CHANGELOG.md \ +&& git commit -m "Adjust changelog for release $VERSION" \ +&& git push origin release/$VERSION ``` -## Commit version changes - -```bash -git add CHANGELOG.md gradle/changelog -git commit -m "Adjust changelog for release " -``` - -## Push release branch - -`git push origin release/` - ## Wait for Jenkins build Jenkins will diff --git a/gradle/changelog/alerts.yaml b/gradle/changelog/alerts.yaml deleted file mode 100644 index 7da4d4f88b..0000000000 --- a/gradle/changelog/alerts.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: added - description: Security notifications to inform the running instance about known security issues ([#1924](https://github.com/scm-manager/scm-manager/pull/1924)) diff --git a/gradle/changelog/autocomplete_namespaces.yaml b/gradle/changelog/autocomplete_namespaces.yaml deleted file mode 100644 index 268c020769..0000000000 --- a/gradle/changelog/autocomplete_namespaces.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: changed - description: Autocompletion for namespaces ([#1916](https://github.com/scm-manager/scm-manager/pull/1916)) diff --git a/gradle/changelog/autocomplete_sorted.yaml b/gradle/changelog/autocomplete_sorted.yaml deleted file mode 100644 index 1058662c1e..0000000000 --- a/gradle/changelog/autocomplete_sorted.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Autocompletion has sorted suggestions ([#1918](https://github.com/scm-manager/scm-manager/pull/1918)) diff --git a/gradle/changelog/compare.yaml b/gradle/changelog/compare.yaml deleted file mode 100644 index a63caa0005..0000000000 --- a/gradle/changelog/compare.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: added - description: Add compare view to see changes between branches, tags and revisions ([#1920](https://github.com/scm-manager/scm-manager/pull/1920)) diff --git a/gradle/changelog/encrypt_myc_token.yaml b/gradle/changelog/encrypt_myc_token.yaml deleted file mode 100644 index 3d3f3b18f1..0000000000 --- a/gradle/changelog/encrypt_myc_token.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Encrypt myCloudogu refresh token on file system ([#1923](https://github.com/scm-manager/scm-manager/pull/1923)) diff --git a/gradle/changelog/fix_unit_tests_on_windows.yaml b/gradle/changelog/fix_unit_tests_on_windows.yaml deleted file mode 100644 index 30be37ec8f..0000000000 --- a/gradle/changelog/fix_unit_tests_on_windows.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Fix bugs in unit tests which occur on Windows only ([#1927](https://github.com/scm-manager/scm-manager/pull/1927)) diff --git a/gradle/changelog/init_git_head_on_creation.yaml b/gradle/changelog/init_git_head_on_creation.yaml deleted file mode 100644 index 2dacd98149..0000000000 --- a/gradle/changelog/init_git_head_on_creation.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Set HEAD to correct branch in new git repositories ([#1929](https://github.com/scm-manager/scm-manager/pull/1929)) diff --git a/gradle/changelog/keep_user_group_selection.yaml b/gradle/changelog/keep_user_group_selection.yaml deleted file mode 100644 index caed050bd9..0000000000 --- a/gradle/changelog/keep_user_group_selection.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: changed - description: Keeps the selection whether to add a user or a group in the repository permission dialog ([#1919](https://github.com/scm-manager/scm-manager/pull/1919)) diff --git a/gradle/changelog/modal-focus.yaml b/gradle/changelog/modal-focus.yaml deleted file mode 100644 index c492f522d6..0000000000 --- a/gradle/changelog/modal-focus.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: added - description: initial focus, submission on pressing enter and fix trap focus for modals ([#1925](https://github.com/scm-manager/scm-manager/pull/1925))