summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2019-08-23 17:22:49 +0000
committerGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2019-08-23 17:22:49 +0000
commit15ea614765ce88a93c91a3b055a7c4fb96fd1ccb (patch)
tree0c436b133e123835b4b69a3bf0cfd3276bd8abd8
parent99e8b77e5eaa8bd60c02935ee5baaebf31bc645a (diff)
downloadgitlab-ce-15ea614765ce88a93c91a3b055a7c4fb96fd1ccb.tar.gz
Update CHANGELOG.md for 12.2.1
[ci skip]
-rw-r--r--CHANGELOG.md13
-rw-r--r--changelogs/unreleased/sh-fix-issues-api-gitaly-nplusone.yml5
-rw-r--r--changelogs/unreleased/sh-revert-redis-cache-store.yml5
-rw-r--r--changelogs/unreleased/tr-param-undefined-fix.yml5
4 files changed, 13 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6c8eccf0b2..ffca09a92e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 12.2.1
+
+### Fixed (3 changes)
+
+- Fix for embedded metrics undefined params. !31975
+- Fix "ERR value is not an integer or out of range" errors. !32126
+- Prevent duplicated trigger action button.
+
+### Performance (1 change)
+
+- Fix Gitaly N+1 calls with listing issues/MRs via API. !31938
+
+
## 12.2.0
### Security (4 changes, 1 of them is from the community)
diff --git a/changelogs/unreleased/sh-fix-issues-api-gitaly-nplusone.yml b/changelogs/unreleased/sh-fix-issues-api-gitaly-nplusone.yml
deleted file mode 100644
index 3177cb8d18c..00000000000
--- a/changelogs/unreleased/sh-fix-issues-api-gitaly-nplusone.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix Gitaly N+1 calls with listing issues/MRs via API
-merge_request: 31938
-author:
-type: performance
diff --git a/changelogs/unreleased/sh-revert-redis-cache-store.yml b/changelogs/unreleased/sh-revert-redis-cache-store.yml
deleted file mode 100644
index 710b6e7941d..00000000000
--- a/changelogs/unreleased/sh-revert-redis-cache-store.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix "ERR value is not an integer or out of range" errors
-merge_request: 32126
-author:
-type: fixed
diff --git a/changelogs/unreleased/tr-param-undefined-fix.yml b/changelogs/unreleased/tr-param-undefined-fix.yml
deleted file mode 100644
index 0a9051485bd..00000000000
--- a/changelogs/unreleased/tr-param-undefined-fix.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix for embedded metrics undefined params
-merge_request: 31975
-author:
-type: fixed