summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Edwards-Jones <jedwardsjones@gitlab.com>2017-07-28 13:46:01 +0100
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-07-28 13:46:01 +0100
commit20d7b04639c38e3216b115484e36446c3465b1bf (patch)
tree5c93666e92897d1728c541e97fe66b6370efc892
parent96701fd469877ef2820b1cbf0e856ff7a5ba65bf (diff)
downloadgitlab-ce-20d7b04639c38e3216b115484e36446c3465b1bf.tar.gz
Update CHANGELOG.md for 9.4.2
[ci skip]
-rw-r--r--CHANGELOG.md15
-rw-r--r--changelogs/unreleased/2971-multiproject-grah-ce-port.yml4
-rw-r--r--changelogs/unreleased/34729-blob.yml4
-rw-r--r--changelogs/unreleased/35338-deploy-keys-should-not-show-pending-delete-projects.yml4
-rw-r--r--changelogs/unreleased/35453-pending-delete-projects-error-in-admin-dashboard-fix.yml4
-rw-r--r--changelogs/unreleased/35478-allow-admin-to-read-user-list.yml4
-rw-r--r--changelogs/unreleased/35539-can-t-create-a-merge-request-containing-a-binary-file-with-non-utf-8-characters.yml5
-rw-r--r--changelogs/unreleased/add-instrumentation-to-link-to-gfm.yml4
-rw-r--r--changelogs/unreleased/fix-gb-fix-build-merge-request-link-to-fork-project.yml4
-rw-r--r--changelogs/unreleased/mk-add-ldap-ssl-certificate-verification.yml4
-rw-r--r--changelogs/unreleased/mk-add-lower-path-index-to-redirect-routes.yml4
-rw-r--r--changelogs/unreleased/new-navigation-custom-logo.yml4
12 files changed, 15 insertions, 45 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 580d2357512..412cd86bad6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,21 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 9.4.2 (2017-07-28)
+
+- Fix job merge request link to a forked source project. !12965
+- Improve redirect route query performance. !13062
+- Allow admin to read_users_list even if it's restricted. !13066
+- Fixes 500 error caused by pending delete projects in admin dashboard. !13067
+- Add instrumentation to MarkupHelper#link_to_gfm. !13069
+- Pending delete projects should not show in deploy keys. !13088
+- Fix sizing of custom header logo in new navigation.
+- Fix crash on /help/ui.
+- Fix creating merge request diffs when diff contains bytes that are invalid in UTF-8.
+- fix vertical alignment of New Project button.
+- Add LDAP SSL certificate verification option.
+- Fix vertical alignment in firefox and safari for pipeline mini graph.
+
## 9.4.1 (2017-07-25)
- Fix pipeline_schedules pages throwing error 500 (when ref is empty). !12983
diff --git a/changelogs/unreleased/2971-multiproject-grah-ce-port.yml b/changelogs/unreleased/2971-multiproject-grah-ce-port.yml
deleted file mode 100644
index 37584cac6ab..00000000000
--- a/changelogs/unreleased/2971-multiproject-grah-ce-port.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix vertical alignment in firefox and safari for pipeline mini graph
-merge_request:
-author:
diff --git a/changelogs/unreleased/34729-blob.yml b/changelogs/unreleased/34729-blob.yml
deleted file mode 100644
index 15a469d3af0..00000000000
--- a/changelogs/unreleased/34729-blob.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix crash on /help/ui
-merge_request:
-author:
diff --git a/changelogs/unreleased/35338-deploy-keys-should-not-show-pending-delete-projects.yml b/changelogs/unreleased/35338-deploy-keys-should-not-show-pending-delete-projects.yml
deleted file mode 100644
index 73808030f4c..00000000000
--- a/changelogs/unreleased/35338-deploy-keys-should-not-show-pending-delete-projects.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Pending delete projects should not show in deploy keys.
-merge_request: 13088
-author:
diff --git a/changelogs/unreleased/35453-pending-delete-projects-error-in-admin-dashboard-fix.yml b/changelogs/unreleased/35453-pending-delete-projects-error-in-admin-dashboard-fix.yml
deleted file mode 100644
index fa906accbb8..00000000000
--- a/changelogs/unreleased/35453-pending-delete-projects-error-in-admin-dashboard-fix.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fixes 500 error caused by pending delete projects in admin dashboard
-merge_request: 13067
-author:
diff --git a/changelogs/unreleased/35478-allow-admin-to-read-user-list.yml b/changelogs/unreleased/35478-allow-admin-to-read-user-list.yml
deleted file mode 100644
index da4b730f0ca..00000000000
--- a/changelogs/unreleased/35478-allow-admin-to-read-user-list.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Allow admin to read_users_list even if it's restricted
-merge_request: 13066
-author:
diff --git a/changelogs/unreleased/35539-can-t-create-a-merge-request-containing-a-binary-file-with-non-utf-8-characters.yml b/changelogs/unreleased/35539-can-t-create-a-merge-request-containing-a-binary-file-with-non-utf-8-characters.yml
deleted file mode 100644
index 8d92aacc9ef..00000000000
--- a/changelogs/unreleased/35539-can-t-create-a-merge-request-containing-a-binary-file-with-non-utf-8-characters.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix creating merge request diffs when diff contains bytes that are invalid
- in UTF-8
-merge_request:
-author:
diff --git a/changelogs/unreleased/add-instrumentation-to-link-to-gfm.yml b/changelogs/unreleased/add-instrumentation-to-link-to-gfm.yml
deleted file mode 100644
index b5cf521561a..00000000000
--- a/changelogs/unreleased/add-instrumentation-to-link-to-gfm.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add instrumentation to MarkupHelper#link_to_gfm
-merge_request: 13069
-author:
diff --git a/changelogs/unreleased/fix-gb-fix-build-merge-request-link-to-fork-project.yml b/changelogs/unreleased/fix-gb-fix-build-merge-request-link-to-fork-project.yml
deleted file mode 100644
index 7a68e91c6d3..00000000000
--- a/changelogs/unreleased/fix-gb-fix-build-merge-request-link-to-fork-project.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix job merge request link to a forked source project
-merge_request: 12965
-author:
diff --git a/changelogs/unreleased/mk-add-ldap-ssl-certificate-verification.yml b/changelogs/unreleased/mk-add-ldap-ssl-certificate-verification.yml
deleted file mode 100644
index 80e6c50d5b3..00000000000
--- a/changelogs/unreleased/mk-add-ldap-ssl-certificate-verification.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add LDAP SSL certificate verification option
-merge_request:
-author:
diff --git a/changelogs/unreleased/mk-add-lower-path-index-to-redirect-routes.yml b/changelogs/unreleased/mk-add-lower-path-index-to-redirect-routes.yml
deleted file mode 100644
index 37a5fa66d13..00000000000
--- a/changelogs/unreleased/mk-add-lower-path-index-to-redirect-routes.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Improve redirect route query performance
-merge_request: 13062
-author:
diff --git a/changelogs/unreleased/new-navigation-custom-logo.yml b/changelogs/unreleased/new-navigation-custom-logo.yml
deleted file mode 100644
index 22e6c5dc7e5..00000000000
--- a/changelogs/unreleased/new-navigation-custom-logo.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix sizing of custom header logo in new navigation
-merge_request:
-author: