From 1b6a590b197788a06a1ff726ea61630a49b10412 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 23 Nov 2020 15:56:40 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-6-stable-ee --- CHANGELOG.md | 15 +++++++++++++++ GITALY_SERVER_VERSION | 2 +- changelogs/unreleased/283825-split-button-gap-mr.yml | 5 ----- .../285220-rename-instance-statistics-as-usage-trends.yml | 5 ----- ...ainer-repository-registries-and-images-on-geo-seco.yml | 5 ----- changelogs/unreleased/ak-fix-project-transfer.yml | 5 ----- changelogs/unreleased/patch-fix-tags-list-13-6.yml | 5 ----- changelogs/unreleased/sy-fix-alerts-active-state.yml | 5 ----- 8 files changed, 16 insertions(+), 31 deletions(-) delete mode 100644 changelogs/unreleased/283825-split-button-gap-mr.yml delete mode 100644 changelogs/unreleased/285220-rename-instance-statistics-as-usage-trends.yml delete mode 100644 changelogs/unreleased/285475-cannot-list-container-repository-registries-and-images-on-geo-seco.yml delete mode 100644 changelogs/unreleased/ak-fix-project-transfer.yml delete mode 100644 changelogs/unreleased/patch-fix-tags-list-13-6.yml delete mode 100644 changelogs/unreleased/sy-fix-alerts-active-state.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index db6392adf9d..6b0c4b07275 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,21 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.6.1 (2020-11-23) + +### Fixed (5 changes) + +- Fix project transfer corrupting shared runners state. !48032 +- Fix project select split button bug. !48065 +- Fix tags pages erroring for projects with private pipelines. !48184 +- Ensure Alerts list loads when only HTTP integrations are enabled. !48247 +- Does not track package events on a read-only instance. !48257 + +### Changed (1 change) + +- Re-name Instance Statistics as Usage Trends. !48183 + + ## 13.6.0 (2020-11-22) ### Removed (3 changes) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 649e128e1b0..156557438e1 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -13.6.0 \ No newline at end of file +13.6.1 \ No newline at end of file diff --git a/changelogs/unreleased/283825-split-button-gap-mr.yml b/changelogs/unreleased/283825-split-button-gap-mr.yml deleted file mode 100644 index d18be8bdd4c..00000000000 --- a/changelogs/unreleased/283825-split-button-gap-mr.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix project select split button bug -merge_request: 48065 -author: -type: fixed diff --git a/changelogs/unreleased/285220-rename-instance-statistics-as-usage-trends.yml b/changelogs/unreleased/285220-rename-instance-statistics-as-usage-trends.yml deleted file mode 100644 index 5552479b63e..00000000000 --- a/changelogs/unreleased/285220-rename-instance-statistics-as-usage-trends.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Re-name Instance Statistics as Usage Trends -merge_request: 48183 -author: -type: changed diff --git a/changelogs/unreleased/285475-cannot-list-container-repository-registries-and-images-on-geo-seco.yml b/changelogs/unreleased/285475-cannot-list-container-repository-registries-and-images-on-geo-seco.yml deleted file mode 100644 index bd6e54bc53d..00000000000 --- a/changelogs/unreleased/285475-cannot-list-container-repository-registries-and-images-on-geo-seco.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Does not track package events on a read-only instance -merge_request: 48257 -author: -type: fixed diff --git a/changelogs/unreleased/ak-fix-project-transfer.yml b/changelogs/unreleased/ak-fix-project-transfer.yml deleted file mode 100644 index 54556b2e3d7..00000000000 --- a/changelogs/unreleased/ak-fix-project-transfer.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix project transfer corrupting shared runners state -merge_request: 48032 -author: -type: fixed diff --git a/changelogs/unreleased/patch-fix-tags-list-13-6.yml b/changelogs/unreleased/patch-fix-tags-list-13-6.yml deleted file mode 100644 index 022064a743d..00000000000 --- a/changelogs/unreleased/patch-fix-tags-list-13-6.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix tags pages erroring for projects with private pipelines -merge_request: 48184 -author: -type: fixed diff --git a/changelogs/unreleased/sy-fix-alerts-active-state.yml b/changelogs/unreleased/sy-fix-alerts-active-state.yml deleted file mode 100644 index f53e782d3f5..00000000000 --- a/changelogs/unreleased/sy-fix-alerts-active-state.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Ensure Alerts list loads when only HTTP integrations are enabled -merge_request: 48247 -author: -type: fixed -- cgit v1.2.1