summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-05-15 17:15:48 +0000
committerGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-05-15 17:15:48 +0000
commita6a408f264f53bd1fc7635ba1ae8eaca8ec9da8b (patch)
tree9c539afcd24cfeb4eb2c7a1d04044d4373c95083
parent9b1c2f43462737ddd3e43dbfb54a22f629f0dcc4 (diff)
downloadgitlab-ce-a6a408f264f53bd1fc7635ba1ae8eaca8ec9da8b.tar.gz
Update CHANGELOG.md for 12.10.6
[ci skip]
-rw-r--r--CHANGELOG.md11
-rw-r--r--changelogs/unreleased/216728-actionview-template-error-undefined-method-pages_domain-for-pagesd.yml5
-rw-r--r--changelogs/unreleased/216851-graphql-externallypaginatedarrayconnection-can-return-incorrect-nu.yml5
-rw-r--r--changelogs/unreleased/216970-add-instance-to-service-if-missing.yml5
-rw-r--r--changelogs/unreleased/217602-file-uploads-on-local-storage-with-nil-secret-in-the-db-are-broken.yml5
-rw-r--r--changelogs/unreleased/cat-duplicate-ci-pipelines-index-215790.yml5
6 files changed, 11 insertions, 25 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9cf809afe01..d82b267037c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 12.10.6 (2020-05-15)
+
+### Fixed (5 changes)
+
+- Fix duplicate index removal on ci_pipelines.project_id. !31043
+- Fix 500 on creating an invalid domains and verification. !31190
+- Fix incorrect number of errors returned when querying sentry errors. !31252
+- Add instance column to services table if it's missing. !31631
+- Fix incorrect regex used in FileUploader#extract_dynamic_path. !32271
+
+
## 12.10.5 (2020-05-13)
### Added (1 change)
diff --git a/changelogs/unreleased/216728-actionview-template-error-undefined-method-pages_domain-for-pagesd.yml b/changelogs/unreleased/216728-actionview-template-error-undefined-method-pages_domain-for-pagesd.yml
deleted file mode 100644
index d34e092c9ee..00000000000
--- a/changelogs/unreleased/216728-actionview-template-error-undefined-method-pages_domain-for-pagesd.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix 500 on creating an invalid domains and verification
-merge_request: 31190
-author:
-type: fixed
diff --git a/changelogs/unreleased/216851-graphql-externallypaginatedarrayconnection-can-return-incorrect-nu.yml b/changelogs/unreleased/216851-graphql-externallypaginatedarrayconnection-can-return-incorrect-nu.yml
deleted file mode 100644
index dd36d52f1c4..00000000000
--- a/changelogs/unreleased/216851-graphql-externallypaginatedarrayconnection-can-return-incorrect-nu.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix incorrect number of errors returned when querying sentry errors
-merge_request: 31252
-author:
-type: fixed
diff --git a/changelogs/unreleased/216970-add-instance-to-service-if-missing.yml b/changelogs/unreleased/216970-add-instance-to-service-if-missing.yml
deleted file mode 100644
index d8fcbb8f587..00000000000
--- a/changelogs/unreleased/216970-add-instance-to-service-if-missing.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add instance column to services table if it's missing
-merge_request: 31631
-author:
-type: fixed
diff --git a/changelogs/unreleased/217602-file-uploads-on-local-storage-with-nil-secret-in-the-db-are-broken.yml b/changelogs/unreleased/217602-file-uploads-on-local-storage-with-nil-secret-in-the-db-are-broken.yml
deleted file mode 100644
index 48e585b59e8..00000000000
--- a/changelogs/unreleased/217602-file-uploads-on-local-storage-with-nil-secret-in-the-db-are-broken.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix incorrect regex used in FileUploader#extract_dynamic_path
-merge_request: 32271
-author:
-type: fixed
diff --git a/changelogs/unreleased/cat-duplicate-ci-pipelines-index-215790.yml b/changelogs/unreleased/cat-duplicate-ci-pipelines-index-215790.yml
deleted file mode 100644
index a21cafe5e14..00000000000
--- a/changelogs/unreleased/cat-duplicate-ci-pipelines-index-215790.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix duplicate index removal on ci_pipelines.project_id
-merge_request: 31043
-author:
-type: fixed