summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md7
-rw-r--r--changelogs/unreleased/37912-fix-dash-in-note-access-role.yml5
-rw-r--r--changelogs/unreleased/38280-undefined-run_command-when-running-rake-gitlab-check.yml5
-rw-r--r--changelogs/unreleased/fix-locked-shared-runners-problem.yml5
-rw-r--r--changelogs/unreleased/rs-allow-name-on-anchors.yml5
5 files changed, 7 insertions, 20 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c671f8d53a..d08e42b3b65 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 10.0.2 (2017-09-27)
+
+- [FIXED] Notes will not show an empty bubble when the author isn't a member. !14450
+- [FIXED] Some checks in `rake gitlab:check` were failling with 'undefined method `run_command`'. !14469
+- [FIXED] Make locked setting of Runner to not affect jobs scheduling. !14483
+- [FIXED] Re-allow `name` attribute on user-provided anchor HTML.
+
## 10.0.1 (2017-09-23)
- [FIXED] Fix duplicate key errors in PostDeployMigrateUserExternalMailData migration.
diff --git a/changelogs/unreleased/37912-fix-dash-in-note-access-role.yml b/changelogs/unreleased/37912-fix-dash-in-note-access-role.yml
deleted file mode 100644
index f9f4120479c..00000000000
--- a/changelogs/unreleased/37912-fix-dash-in-note-access-role.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Notes will not show an empty bubble when the author isn't a member.
-merge_request: 14450
-author:
-type: fixed
diff --git a/changelogs/unreleased/38280-undefined-run_command-when-running-rake-gitlab-check.yml b/changelogs/unreleased/38280-undefined-run_command-when-running-rake-gitlab-check.yml
deleted file mode 100644
index 7d3fb7d43cc..00000000000
--- a/changelogs/unreleased/38280-undefined-run_command-when-running-rake-gitlab-check.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Some checks in `rake gitlab:check` were failling with 'undefined method `run_command`'
-merge_request: 14469
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-locked-shared-runners-problem.yml b/changelogs/unreleased/fix-locked-shared-runners-problem.yml
deleted file mode 100644
index 3e3cccf79eb..00000000000
--- a/changelogs/unreleased/fix-locked-shared-runners-problem.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Make locked setting of Runner to not affect jobs scheduling
-merge_request: 14483
-author:
-type: fixed
diff --git a/changelogs/unreleased/rs-allow-name-on-anchors.yml b/changelogs/unreleased/rs-allow-name-on-anchors.yml
deleted file mode 100644
index 59e95ed8a0e..00000000000
--- a/changelogs/unreleased/rs-allow-name-on-anchors.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Re-allow `name` attribute on user-provided anchor HTML
-merge_request:
-author:
-type: fixed