summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-01-08 09:11:31 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-01-08 09:11:31 +0000
commit1ef3b81f122ba52e955bee694c38d6fb4dae3068 (patch)
treef1126edd758aa240734bb557f36b0e8f98a8193d
parentd802dc9bf2036124c3b0b8717a719161bc6ded67 (diff)
downloadgitlab-ce-1ef3b81f122ba52e955bee694c38d6fb4dae3068.tar.gz
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.3
-rw-r--r--CHANGELOG.md13
-rw-r--r--GITALY_SERVER_VERSION2
-rw-r--r--changelogs/unreleased/13-7-stable-ee-patch_10io-fix-graphql-container-repository-tag-size-type.yml5
-rw-r--r--changelogs/unreleased/289925-subscription-expiration-banner-not-dismissable.yml5
-rw-r--r--changelogs/unreleased/293845-allow-nullable-digest.yml5
-rw-r--r--changelogs/unreleased/294221-gitlab-pages-deployments-over-the-max-int-size-in-bytes-fail-to-up.yml5
-rw-r--r--changelogs/unreleased/296563-follow-up-from-fix-project-access-token-regression.yml5
-rw-r--r--changelogs/unreleased/fix-canary-update-service-to-invalidate-cache.yml5
-rw-r--r--changelogs/unreleased/update-helm-2-to-2-17-0.yml5
9 files changed, 14 insertions, 36 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e45d9933ab4..86cdb79d4db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 13.7.3 (2021-01-08)
+
+### Fixed (7 changes)
+
+- Fix Canary Ingress weight is not reflected on UI immediately. !50246
+- Change pages deployments size to bigint. !50262
+- Fix viewing container repositories with tags with corrupted manifest. !50362
+- Fix the graphQL type for container repository tags. !50419
+- Fix(eetrialbanner): fix EE trial banner to allow dismiss. !50436
+- Update Helm 2 version to 2.17.0. !50547
+- Fix project access token regression. !50800
+
+
## 13.7.2 (2021-01-07)
### Security (7 changes)
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 4ed0bdb8717..e32d1dd484c 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-13.7.2 \ No newline at end of file
+13.7.3 \ No newline at end of file
diff --git a/changelogs/unreleased/13-7-stable-ee-patch_10io-fix-graphql-container-repository-tag-size-type.yml b/changelogs/unreleased/13-7-stable-ee-patch_10io-fix-graphql-container-repository-tag-size-type.yml
deleted file mode 100644
index 5323ac46f9f..00000000000
--- a/changelogs/unreleased/13-7-stable-ee-patch_10io-fix-graphql-container-repository-tag-size-type.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix the graphQL type for container repository tags
-merge_request: 50419
-author:
-type: fixed
diff --git a/changelogs/unreleased/289925-subscription-expiration-banner-not-dismissable.yml b/changelogs/unreleased/289925-subscription-expiration-banner-not-dismissable.yml
deleted file mode 100644
index 311784e05f8..00000000000
--- a/changelogs/unreleased/289925-subscription-expiration-banner-not-dismissable.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'Fix(eetrialbanner): fix EE trial banner to allow dismiss'
-merge_request: 50436
-author:
-type: fixed
diff --git a/changelogs/unreleased/293845-allow-nullable-digest.yml b/changelogs/unreleased/293845-allow-nullable-digest.yml
deleted file mode 100644
index cc3d1198a1c..00000000000
--- a/changelogs/unreleased/293845-allow-nullable-digest.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix viewing container repositories with tags with corrupted manifest
-merge_request: 50362
-author:
-type: fixed
diff --git a/changelogs/unreleased/294221-gitlab-pages-deployments-over-the-max-int-size-in-bytes-fail-to-up.yml b/changelogs/unreleased/294221-gitlab-pages-deployments-over-the-max-int-size-in-bytes-fail-to-up.yml
deleted file mode 100644
index 233d52f0df5..00000000000
--- a/changelogs/unreleased/294221-gitlab-pages-deployments-over-the-max-int-size-in-bytes-fail-to-up.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Change pages deployments size to bigint
-merge_request: 50262
-author:
-type: fixed
diff --git a/changelogs/unreleased/296563-follow-up-from-fix-project-access-token-regression.yml b/changelogs/unreleased/296563-follow-up-from-fix-project-access-token-regression.yml
deleted file mode 100644
index c280ccb21ec..00000000000
--- a/changelogs/unreleased/296563-follow-up-from-fix-project-access-token-regression.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix project access token regression
-merge_request: 50800
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-canary-update-service-to-invalidate-cache.yml b/changelogs/unreleased/fix-canary-update-service-to-invalidate-cache.yml
deleted file mode 100644
index aea2dec8268..00000000000
--- a/changelogs/unreleased/fix-canary-update-service-to-invalidate-cache.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix Canary Ingress weight is not reflected on UI immediately
-merge_request: 50246
-author:
-type: fixed
diff --git a/changelogs/unreleased/update-helm-2-to-2-17-0.yml b/changelogs/unreleased/update-helm-2-to-2-17-0.yml
deleted file mode 100644
index d6941878b48..00000000000
--- a/changelogs/unreleased/update-helm-2-to-2-17-0.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update Helm 2 version to 2.17.0
-merge_request: 50547
-author:
-type: fixed