summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-04-15 15:34:54 +0000
committerNick Thomas <nick@gitlab.com>2019-04-15 15:34:54 +0000
commit95bbcf082970ae72d3bac814101803e4118db47e (patch)
treed75a2b20426d04211ec0adae40147e51e16828b0 /changelogs
parent6e3c9bee8bf09b2dd842e4e017e6f58c23dad32b (diff)
parent75ec347d4499b98f27aa1f712258e7fac25fab15 (diff)
downloadgitlab-ce-95bbcf082970ae72d3bac814101803e4118db47e.tar.gz
Merge branch 'zj-fsck-no-timeout' into 'master'
Git FSCK has no timeout Closes #53319 See merge request gitlab-org/gitlab-ce!27299
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/zj-fsck-no-timeout.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/zj-fsck-no-timeout.yml b/changelogs/unreleased/zj-fsck-no-timeout.yml
new file mode 100644
index 00000000000..044f269bb4d
--- /dev/null
+++ b/changelogs/unreleased/zj-fsck-no-timeout.yml
@@ -0,0 +1,5 @@
+---
+title: Remove deadline for Git fsck
+merge_request: 27299
+author:
+type: fixed