Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-05-28 15:06:36 +0300
committerFilipa Lacerda <filipa@gitlab.com>2018-05-28 15:06:36 +0300
commit0d27e8b3cca92b271b151bf22f9da9b747ddca41 (patch)
treeeeb5e920cae392926a33db6a4114f904f2113009
parent5ebe2ebdc1f6b16dfba63cc78870359c49c6bf0d (diff)
Update CHANGELOG.md for 10.8.2
[ci skip]
-rw-r--r--CHANGELOG.md9
-rw-r--r--changelogs/unreleased/security-10-8.yml5
-rw-r--r--changelogs/unreleased/security-dm-delete-deploy-key.yml5
-rw-r--r--changelogs/unreleased/security-fj-import-export-assignment.yml5
4 files changed, 9 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15730488819..c9950a51785 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 10.8.2 (2018-05-28)
+
+### Security (3 changes)
+
+- Prevent user passwords from being changed without providing the previous password.
+- Fix API to remove deploy key from project instead of deleting it entirely.
+- Fixed bug that allowed importing arbitrary project attributes.
+
+
## 10.8.1 (2018-05-23)
### Fixed (9 changes)
diff --git a/changelogs/unreleased/security-10-8.yml b/changelogs/unreleased/security-10-8.yml
deleted file mode 100644
index 824fbd41ab8..00000000000
--- a/changelogs/unreleased/security-10-8.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Prevent user passwords from being changed without providing the previous password
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/security-dm-delete-deploy-key.yml b/changelogs/unreleased/security-dm-delete-deploy-key.yml
deleted file mode 100644
index aa94e7b6072..00000000000
--- a/changelogs/unreleased/security-dm-delete-deploy-key.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix API to remove deploy key from project instead of deleting it entirely
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/security-fj-import-export-assignment.yml b/changelogs/unreleased/security-fj-import-export-assignment.yml
deleted file mode 100644
index 4bfd71d431a..00000000000
--- a/changelogs/unreleased/security-fj-import-export-assignment.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fixed bug that allowed importing arbitrary project attributes
-merge_request:
-author:
-type: security