summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRegis <boudinot.regis@yahoo.com>2017-05-25 16:47:35 -0600
committerRegis <boudinot.regis@yahoo.com>2017-05-25 16:47:35 -0600
commitb2ec774c235fdae10ae08335d3cad2aea9f2987e (patch)
tree4f002b1c2874fa27f359ea8ec2f6028654f2bcde
parentbf5339d3e6bcb42957088ae71afec7e74414eae5 (diff)
downloadgitlab-ce-b2ec774c235fdae10ae08335d3cad2aea9f2987e.tar.gz
Update CHANGELOG.md for 9.2.2
[ci skip]
-rw-r--r--CHANGELOG.md5
-rw-r--r--changelogs/unreleased/32715-fix-note-padding.yml4
-rw-r--r--changelogs/unreleased/zj-fix-pipeline-etag.yml4
3 files changed, 5 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e6d8d398a5..c27d4c20d76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 9.2.2 (2017-05-25)
+
+- Fix issue where real time pipelines were not cached. !11615
+- Make all notes use equal padding.
+
## 9.2.1 (2017-05-23)
- Fix placement of note emoji on hover.
diff --git a/changelogs/unreleased/32715-fix-note-padding.yml b/changelogs/unreleased/32715-fix-note-padding.yml
deleted file mode 100644
index 867ed7eb171..00000000000
--- a/changelogs/unreleased/32715-fix-note-padding.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Make all notes use equal padding
-merge_request:
-author:
diff --git a/changelogs/unreleased/zj-fix-pipeline-etag.yml b/changelogs/unreleased/zj-fix-pipeline-etag.yml
deleted file mode 100644
index 03ebef8c575..00000000000
--- a/changelogs/unreleased/zj-fix-pipeline-etag.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix issue where real time pipelines were not cached
-merge_request: 11615
-author: