diff --git a/CHANGELOG b/CHANGELOG index 79366053775da0cf1722d34b5dadee435847083d..4865a7fcb63af742e3d959c08213463326a1ffdb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,15 @@ # Changelog for gitlab-workhorse +## v8.40.0 + +### Added +- Add project level route for conan package uploads + https://gitlab.com/gitlab-org/gitlab-workhorse/-/merge_requests/558 + +### Other +- Refactor uploaders to use different upload strategies + https://gitlab.com/gitlab-org/gitlab-workhorse/-/merge_requests/553 + ## v8.39.0 ### Fixed diff --git a/changelogs/unreleased/11679-conan-project-level-route.yml b/changelogs/unreleased/11679-conan-project-level-route.yml deleted file mode 100644 index 8316524ec3fece5de179e9da59bb5dcb9d423b45..0000000000000000000000000000000000000000 --- a/changelogs/unreleased/11679-conan-project-level-route.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add project level route for conan package uploads -merge_request: 558 -author: -type: added diff --git a/changelogs/unreleased/sh-refactor-uploaders.yml b/changelogs/unreleased/sh-refactor-uploaders.yml deleted file mode 100644 index 48bb932f0dbe9ab5cfe29e3eaab925e27ecf949b..0000000000000000000000000000000000000000 --- a/changelogs/unreleased/sh-refactor-uploaders.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Refactor uploaders to use different upload strategies -merge_request: 553 -author: -type: other