summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2017-11-23 10:52:42 -0800
committerMichael Kozono <mkozono@gmail.com>2017-11-23 10:52:42 -0800
commitcf631ddbdceec49579a658698f11679a29cea579 (patch)
treed9e0c5c985b0542cfc5fff8089d2eb9100462dd9
parent1da5df70a99cb2f129ba56ae6eb3836dca56e136 (diff)
downloadgitlab-ce-cf631ddbdceec49579a658698f11679a29cea579.tar.gz
Update CHANGELOG.md for 10.2.2
[ci skip]
-rw-r--r--CHANGELOG.md22
-rw-r--r--changelogs/unreleased/1870-impersonation-stuck-on-password-change.yml5
-rw-r--r--changelogs/unreleased/39167-async-boards-sidebar.yml5
-rw-r--r--changelogs/unreleased/39461-notes-api-for-issues-no-longer-returns-label-additions-removals.yml5
-rw-r--r--changelogs/unreleased/40292-bitbucket-import-hashed-storage.yml5
-rw-r--r--changelogs/unreleased/40377-blank-states.yml5
-rw-r--r--changelogs/unreleased/bvl-dont-move-projects-using-hashed-storage.yml5
-rw-r--r--changelogs/unreleased/fix-ci-pipelines-index.yml5
-rw-r--r--changelogs/unreleased/issue_40337.yml5
-rw-r--r--changelogs/unreleased/osw-merge-process-logs.yml5
-rw-r--r--changelogs/unreleased/reduce-queries-for-artifacts-button.yml5
11 files changed, 22 insertions, 50 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 221626e7bf8..92dd4d7610f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,28 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 10.2.2 (2017-11-23)
+
+### Fixed (5 changes)
+
+- Label addition/removal are not going to be redacted wrongfully in the API. !15080
+- Fix bitbucket wiki import with hashed storage enabled. !15490
+- Impersonation no longer gets stuck on password change. !15497
+- Fix blank states using old css.
+- Fix promoting milestone updating all issuables without milestone.
+
+### Performance (3 changes)
+
+- Update Issue Boards to fetch the notification subscription status asynchronously.
+- Update composite pipelines index to include "id".
+- Use arrays in Pipeline#latest_builds_with_artifacts.
+
+### Other (2 changes)
+
+- Don't move repositories and attachments for projects using hashed storage. !15479
+- Add logs for monitoring the merge process.
+
+
## 10.2.1 (2017-11-22)
### Fixed (1 change)
diff --git a/changelogs/unreleased/1870-impersonation-stuck-on-password-change.yml b/changelogs/unreleased/1870-impersonation-stuck-on-password-change.yml
deleted file mode 100644
index b217cb44bf7..00000000000
--- a/changelogs/unreleased/1870-impersonation-stuck-on-password-change.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Impersonation no longer gets stuck on password change.
-merge_request: 15497
-author:
-type: fixed
diff --git a/changelogs/unreleased/39167-async-boards-sidebar.yml b/changelogs/unreleased/39167-async-boards-sidebar.yml
deleted file mode 100644
index dc77f1ad451..00000000000
--- a/changelogs/unreleased/39167-async-boards-sidebar.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update Issue Boards to fetch the notification subscription status asynchronously
-merge_request:
-author:
-type: performance
diff --git a/changelogs/unreleased/39461-notes-api-for-issues-no-longer-returns-label-additions-removals.yml b/changelogs/unreleased/39461-notes-api-for-issues-no-longer-returns-label-additions-removals.yml
deleted file mode 100644
index 36c2f789eeb..00000000000
--- a/changelogs/unreleased/39461-notes-api-for-issues-no-longer-returns-label-additions-removals.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Label addition/removal are not going to be redacted wrongfully in the API.
-merge_request: 15080
-author:
-type: fixed
diff --git a/changelogs/unreleased/40292-bitbucket-import-hashed-storage.yml b/changelogs/unreleased/40292-bitbucket-import-hashed-storage.yml
deleted file mode 100644
index e5879f89156..00000000000
--- a/changelogs/unreleased/40292-bitbucket-import-hashed-storage.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix bitbucket wiki import with hashed storage enabled
-merge_request: 15490
-author:
-type: fixed
diff --git a/changelogs/unreleased/40377-blank-states.yml b/changelogs/unreleased/40377-blank-states.yml
deleted file mode 100644
index 7635602c68c..00000000000
--- a/changelogs/unreleased/40377-blank-states.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix blank states using old css
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/bvl-dont-move-projects-using-hashed-storage.yml b/changelogs/unreleased/bvl-dont-move-projects-using-hashed-storage.yml
deleted file mode 100644
index e0895cb5d48..00000000000
--- a/changelogs/unreleased/bvl-dont-move-projects-using-hashed-storage.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Don't move repositories and attachments for projects using hashed storage
-merge_request: 15479
-author:
-type: other
diff --git a/changelogs/unreleased/fix-ci-pipelines-index.yml b/changelogs/unreleased/fix-ci-pipelines-index.yml
deleted file mode 100644
index 772093fbef0..00000000000
--- a/changelogs/unreleased/fix-ci-pipelines-index.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update composite pipelines index to include "id"
-merge_request:
-author:
-type: performance
diff --git a/changelogs/unreleased/issue_40337.yml b/changelogs/unreleased/issue_40337.yml
deleted file mode 100644
index 0cd6c5f46a9..00000000000
--- a/changelogs/unreleased/issue_40337.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix promoting milestone updating all issuables without milestone
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/osw-merge-process-logs.yml b/changelogs/unreleased/osw-merge-process-logs.yml
deleted file mode 100644
index d2bb0e09834..00000000000
--- a/changelogs/unreleased/osw-merge-process-logs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add logs for monitoring the merge process
-merge_request:
-author:
-type: other
diff --git a/changelogs/unreleased/reduce-queries-for-artifacts-button.yml b/changelogs/unreleased/reduce-queries-for-artifacts-button.yml
deleted file mode 100644
index f2d469b5a80..00000000000
--- a/changelogs/unreleased/reduce-queries-for-artifacts-button.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use arrays in Pipeline#latest_builds_with_artifacts
-merge_request:
-author:
-type: performance