summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-07-19 21:17:24 -0500
committerMike Greiling <mike@pixelcog.com>2017-07-19 21:17:24 -0500
commitd3d877813cab8bfdc25ef06011a95190871e3f8e (patch)
tree3ca0b77d4c378fa3600ea81b3d81133d6e0bdf2f
parent9d03637307212856e9f52a0c097aa8a6bff35ea1 (diff)
parent55453215dffd1fc510caed07e2b155756de93401 (diff)
downloadgitlab-ce-d3d877813cab8bfdc25ef06011a95190871e3f8e.tar.gz
Merge remote-tracking branch 'dev/master'
* dev/master: Update CHANGELOG.md for 9.0.11 Update CHANGELOG.md for 9.1.8 Update CHANGELOG.md for 8.17.7 Update CHANGELOG.md for 9.2.8 Update CHANGELOG.md for 9.3.8
-rw-r--r--CHANGELOG.md32
-rw-r--r--changelogs/unreleased/adam-external-issue-references-spike.yml4
2 files changed, 32 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6f955553e1..de3b4b0d3e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 9.3.8 (2017-07-19)
+
+- Improve support for external issue references. !12485
+- Renders 404 if given project is not readable by the user on Todos dashboard.
+- Use uploads/system directory for personal snippets.
+- Remove uploads/appearance symlink. A leftover from a previous migration.
+
## 9.3.7 (2017-07-18)
- Prevent bad data being added to application settings when Redis is unavailable. !12750
@@ -263,6 +270,13 @@ entry.
- Remove foreigh key on ci_trigger_schedules only if it exists.
- Allow translation of Pipeline Schedules.
+## 9.2.8 (2017-07-19)
+
+- Improve support for external issue references. !12485
+- Renders 404 if given project is not readable by the user on Todos dashboard.
+- Fix incorrect project authorizations.
+- Remove uploads/appearance symlink. A leftover from a previous migration.
+
## 9.2.7 (2017-06-21)
- Reinstate is_admin flag in users api when authenticated user is an admin. !12211 (rickettm)
@@ -507,6 +521,13 @@ entry.
- Fix preemptive scroll bar on user activity calendar.
- Pipeline chat notifications convert seconds to minutes and hours.
+## 9.1.8 (2017-07-19)
+
+- Improve support for external issue references. !12485
+- Renders 404 if given project is not readable by the user on Todos dashboard.
+- Fix incorrect project authorizations.
+- Remove uploads/appearance symlink. A leftover from a previous migration.
+
## 9.1.7 (2017-06-07)
- No changes.
@@ -819,6 +840,12 @@ entry.
- Only send chat notifications for the default branch.
- Don't fill in the default kubernetes namespace.
+## 9.0.11 (2017-07-19)
+
+- Renders 404 if given project is not readable by the user on Todos dashboard.
+- Fix incorrect project authorizations.
+- Remove uploads/appearance symlink. A leftover from a previous migration.
+
## 9.0.10 (2017-06-07)
- No changes.
@@ -1189,6 +1216,11 @@ entry.
- Change development tanuki favicon colors to match logo color order.
- API issues - support filtering by iids.
+## 8.17.7 (2017-07-19)
+
+- Renders 404 if given project is not readable by the user on Todos dashboard.
+- Fix incorrect project authorizations.
+
## 8.17.6 (2017-05-05)
- Enforce project features when searching blobs and wikis.
diff --git a/changelogs/unreleased/adam-external-issue-references-spike.yml b/changelogs/unreleased/adam-external-issue-references-spike.yml
deleted file mode 100644
index aeec6688425..00000000000
--- a/changelogs/unreleased/adam-external-issue-references-spike.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Improve support for external issue references
-merge_request: 12485
-author: