diff options
| author | Sami Hiltunen <shiltunen@gitlab.com> | 2020-08-26 18:24:42 +0300 |
|---|---|---|
| committer | Sami Hiltunen <shiltunen@gitlab.com> | 2020-08-26 18:24:42 +0300 |
| commit | 8c83b011df5ea84bcda69d098382460ca693d662 (patch) | |
| tree | 955218058b5403794eae98b3b11e151f9c948cc0 /config.toml.example | |
| parent | 75476fb963458472a62440f11dd02ef9eaa21f24 (diff) | |
| parent | 0f77ed1ff16e3ada78657a39a80186627ce20bf8 (diff) | |
Merge branch 'sh-support-gitlab-shell-relative-path' into 'master'
Fix Git hooks when GitLab relative URL path and UNIX socket in use
See merge request gitlab-org/gitaly!2485
Diffstat (limited to 'config.toml.example')
| -rw-r--r-- | config.toml.example | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config.toml.example b/config.toml.example index c8d408320..befe90a37 100644 --- a/config.toml.example +++ b/config.toml.example @@ -93,6 +93,9 @@ custom_hooks_dir = "/home/git/custom_hooks" [gitlab] secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret" url = "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" +# Only needed if a UNIX socket is used in `url` and GitLab is configured to +# use a relative path (e.g. /gitlab). +# relative_url_root = '/' [gitlab.http-settings] # read_timeout = 300 |