summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md15
-rw-r--r--changelogs/unreleased/31556-ci-coverage-paralel-rspec.yml4
-rw-r--r--changelogs/unreleased/32790-pipeline_schedules-pages-throwing-error-500.yml4
-rw-r--r--changelogs/unreleased/32995-issue-contents-dynamically-replaced-with-stale-version-after-saving-or-refreshing-relative-external_url-only.yml4
-rw-r--r--changelogs/unreleased/33048-markdown-rendering-of-md-files-has-ceased-to-display-latex-equations.yml4
-rw-r--r--changelogs/unreleased/counters_cache_invalidation.yml4
-rw-r--r--changelogs/unreleased/fix-backup-restore-resume.yml4
-rw-r--r--changelogs/unreleased/fix-gb-use-merge-ability-for-protected-manual-actions.yml4
-rw-r--r--changelogs/unreleased/fix-terminals-support-for-kubernetes-service.yml4
-rw-r--r--changelogs/unreleased/sh-fix-lfs-from-moving-across-filesystems.yml4
-rw-r--r--changelogs/unreleased/sh-fix-submodules-trailing-spaces.yml4
-rw-r--r--changelogs/unreleased/sh-recaptcha-fix-try2.yml4
-rw-r--r--changelogs/unreleased/zj-drop-fk-if-exists.yml4
13 files changed, 15 insertions, 48 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5567dc3b39..f43858a00a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,21 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 9.2.6 (2017-06-16)
+
+- Fix the last coverage in trace log should be extracted. !11128 (dosuken123)
+- Respect merge, instead of push, permissions for protected actions. !11648
+- Fix pipeline_schedules pages throwing error 500. !11706 (dosuken123)
+- Make backup task to continue on corrupt repositories. !11962
+- Fix incorrect ETag cache key when relative instance URL is used. !11964
+- Fix math rendering on blob pages.
+- Invalidate cache for issue and MR counters more granularly.
+- Fix terminals support for Kubernetes Service.
+- Fix LFS timeouts when trying to save large files.
+- Strip trailing whitespaces in submodule URLs.
+- Make sure reCAPTCHA configuration is loaded when spam checks are initiated.
+- Remove foreigh key on ci_trigger_schedules only if it exists.
+
## 9.2.5 (2017-06-07)
- No changes.
diff --git a/changelogs/unreleased/31556-ci-coverage-paralel-rspec.yml b/changelogs/unreleased/31556-ci-coverage-paralel-rspec.yml
deleted file mode 100644
index 4137050a077..00000000000
--- a/changelogs/unreleased/31556-ci-coverage-paralel-rspec.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix the last coverage in trace log should be extracted
-merge_request: 11128
-author: dosuken123
diff --git a/changelogs/unreleased/32790-pipeline_schedules-pages-throwing-error-500.yml b/changelogs/unreleased/32790-pipeline_schedules-pages-throwing-error-500.yml
deleted file mode 100644
index a58f3a7429e..00000000000
--- a/changelogs/unreleased/32790-pipeline_schedules-pages-throwing-error-500.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix pipeline_schedules pages throwing error 500
-merge_request: 11706
-author: dosuken123
diff --git a/changelogs/unreleased/32995-issue-contents-dynamically-replaced-with-stale-version-after-saving-or-refreshing-relative-external_url-only.yml b/changelogs/unreleased/32995-issue-contents-dynamically-replaced-with-stale-version-after-saving-or-refreshing-relative-external_url-only.yml
deleted file mode 100644
index 5cd36a4e3e2..00000000000
--- a/changelogs/unreleased/32995-issue-contents-dynamically-replaced-with-stale-version-after-saving-or-refreshing-relative-external_url-only.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix incorrect ETag cache key when relative instance URL is used
-merge_request: 11964
-author:
diff --git a/changelogs/unreleased/33048-markdown-rendering-of-md-files-has-ceased-to-display-latex-equations.yml b/changelogs/unreleased/33048-markdown-rendering-of-md-files-has-ceased-to-display-latex-equations.yml
deleted file mode 100644
index 5648e013e75..00000000000
--- a/changelogs/unreleased/33048-markdown-rendering-of-md-files-has-ceased-to-display-latex-equations.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix math rendering on blob pages
-merge_request:
-author:
diff --git a/changelogs/unreleased/counters_cache_invalidation.yml b/changelogs/unreleased/counters_cache_invalidation.yml
deleted file mode 100644
index 1e78765ec10..00000000000
--- a/changelogs/unreleased/counters_cache_invalidation.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Invalidate cache for issue and MR counters more granularly
-merge_request:
-author:
diff --git a/changelogs/unreleased/fix-backup-restore-resume.yml b/changelogs/unreleased/fix-backup-restore-resume.yml
deleted file mode 100644
index b7dfd451f5d..00000000000
--- a/changelogs/unreleased/fix-backup-restore-resume.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Make backup task to continue on corrupt repositories
-merge_request: 11962
-author:
diff --git a/changelogs/unreleased/fix-gb-use-merge-ability-for-protected-manual-actions.yml b/changelogs/unreleased/fix-gb-use-merge-ability-for-protected-manual-actions.yml
deleted file mode 100644
index 43c18502cd6..00000000000
--- a/changelogs/unreleased/fix-gb-use-merge-ability-for-protected-manual-actions.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Respect merge, instead of push, permissions for protected actions
-merge_request: 11648
-author:
diff --git a/changelogs/unreleased/fix-terminals-support-for-kubernetes-service.yml b/changelogs/unreleased/fix-terminals-support-for-kubernetes-service.yml
deleted file mode 100644
index fb91da9510c..00000000000
--- a/changelogs/unreleased/fix-terminals-support-for-kubernetes-service.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix terminals support for Kubernetes Service
-merge_request:
-author:
diff --git a/changelogs/unreleased/sh-fix-lfs-from-moving-across-filesystems.yml b/changelogs/unreleased/sh-fix-lfs-from-moving-across-filesystems.yml
deleted file mode 100644
index 161bce45601..00000000000
--- a/changelogs/unreleased/sh-fix-lfs-from-moving-across-filesystems.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix LFS timeouts when trying to save large files
-merge_request:
-author:
diff --git a/changelogs/unreleased/sh-fix-submodules-trailing-spaces.yml b/changelogs/unreleased/sh-fix-submodules-trailing-spaces.yml
deleted file mode 100644
index d633995d467..00000000000
--- a/changelogs/unreleased/sh-fix-submodules-trailing-spaces.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Strip trailing whitespaces in submodule URLs
-merge_request:
-author:
diff --git a/changelogs/unreleased/sh-recaptcha-fix-try2.yml b/changelogs/unreleased/sh-recaptcha-fix-try2.yml
deleted file mode 100644
index 94729252c6f..00000000000
--- a/changelogs/unreleased/sh-recaptcha-fix-try2.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Make sure reCAPTCHA configuration is loaded when spam checks are initiated
-merge_request:
-author:
diff --git a/changelogs/unreleased/zj-drop-fk-if-exists.yml b/changelogs/unreleased/zj-drop-fk-if-exists.yml
deleted file mode 100644
index 237ba936de9..00000000000
--- a/changelogs/unreleased/zj-drop-fk-if-exists.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Remove foreigh key on ci_trigger_schedules only if it exists
-merge_request:
-author: