diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-05-05 16:40:52 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-05-05 16:40:52 +0300 |
| commit | faf2ce89cd4eafdccb78823cf1a32c338a8d9a79 (patch) | |
| tree | 1931a7f2929a252778400e2b97d44992f5d5725e /config | |
| parent | 7e0e45dbf174bb82cc0ea8191a869612ad60b4f7 (diff) | |
| parent | 0f1273fa44a9122bffbd5cecbaea99b1db781d7e (diff) | |
Merge branch 'mrchrisw-import-shell-timeout'
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 3 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index c2eaf263937..fa503f84dd0 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -502,6 +502,9 @@ production: &base upload_pack: true receive_pack: true + # Git import/fetch timeout + # git_timeout: 800 + # If you use non-standard ssh port you need to specify it # ssh_port: 22 diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 7a8f00f11b2..6a6fbe86df9 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -386,6 +386,7 @@ Settings.gitlab_shell['ssh_port'] ||= 22 Settings.gitlab_shell['ssh_user'] ||= Settings.gitlab.user Settings.gitlab_shell['owner_group'] ||= Settings.gitlab.user Settings.gitlab_shell['ssh_path_prefix'] ||= Settings.__send__(:build_gitlab_shell_ssh_path_prefix) +Settings.gitlab_shell['git_timeout'] ||= 800 # # Workhorse |