summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-01-04 15:57:45 +0000
committerDouwe Maan <douwe@gitlab.com>2018-01-04 15:57:45 +0000
commitd2891822e708f91c92b3a45bbbb78831b424e59a (patch)
tree88bfde58794b13c638498c5c67eb8d9b49e344d9 /changelogs
parent1e950e3148d31cb3b242cb21be11e04964c2a037 (diff)
parentf635277228c4ac90bd7215db741392df1998ddfc (diff)
downloadgitlab-ce-d2891822e708f91c92b3a45bbbb78831b424e59a.tar.gz
Merge branch 'mk-no-op-delete-conflicting-redirects' into 'master'
Prevent excessive DB load due to faulty DeleteConflictingRedirectRoutes background migration See merge request gitlab-org/gitlab-ce!16205
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/mk-no-op-delete-conflicting-redirects.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/unreleased/mk-no-op-delete-conflicting-redirects.yml b/changelogs/unreleased/mk-no-op-delete-conflicting-redirects.yml
new file mode 100644
index 00000000000..37fdb1df6df
--- /dev/null
+++ b/changelogs/unreleased/mk-no-op-delete-conflicting-redirects.yml
@@ -0,0 +1,6 @@
+---
+title: Prevent excessive DB load due to faulty DeleteConflictingRedirectRoutes background
+ migration
+merge_request: 16205
+author:
+type: fixed