summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorChris Wilson <chris@chrisjwilson.com>2017-04-14 11:53:30 +1000
committerChris Wilson <chris@chrisjwilson.com>2017-04-27 10:51:35 +1000
commit0f1273fa44a9122bffbd5cecbaea99b1db781d7e (patch)
tree1cb3a5dfdb669ff2f5eda3181f91e4ecf127d9dc /changelogs
parent5173baa0046b6656dcbb52bf5447a0de3749fd6a (diff)
downloadgitlab-ce-0f1273fa44a9122bffbd5cecbaea99b1db781d7e.tar.gz
Add configurable timeout for git fetch and clone operationsmrchrisw-import-shell-timeout
GitLab uses the import_project method in GitLab Shell, This method uses a timeout for the operation, hardcoded to 800 seconds. With this MR the timeout is now configurable in the gitlab_shell settings.
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/mrchrisw-import-shell-timeout.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/mrchrisw-import-shell-timeout.yml b/changelogs/unreleased/mrchrisw-import-shell-timeout.yml
new file mode 100644
index 00000000000..e43409109d6
--- /dev/null
+++ b/changelogs/unreleased/mrchrisw-import-shell-timeout.yml
@@ -0,0 +1,4 @@
+---
+title: Add configurable timeout for git fetch and clone operations
+merge_request: 10697
+author: