diff options
| author | John Cai <jcai@gitlab.com> | 2020-05-20 20:04:55 +0300 |
|---|---|---|
| committer | Paul Okstad <pokstad@gitlab.com> | 2020-05-20 20:04:55 +0300 |
| commit | beed5570e576218520ee4a119fcdc7cf06c74fbb (patch) | |
| tree | 3e6bc08222c2b730fdd1059fec08b407e00c66c8 /config.toml.example | |
| parent | 927005da7132dff3a4886145de0b9cf6e2f0b8ef (diff) | |
Revert "Revert "Merge branch 'jc-change-to-hooks' into 'master'""
This reverts commit 51d96bd920b4f07e87e84fd79c72a9b3c2f9902e.
Diffstat (limited to 'config.toml.example')
| -rw-r--r-- | config.toml.example | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/config.toml.example b/config.toml.example index aaab83c21..d89f2da8a 100644 --- a/config.toml.example +++ b/config.toml.example @@ -86,11 +86,14 @@ dir = "/home/git/gitaly/ruby" [gitlab-shell] # The directory where gitlab-shell is installed dir = "/home/git/gitlab-shell" -secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret" + +[hooks] custom_hooks_dir = "/home/git/custom_hooks" -gitlab_url = "http://localhost:8080" -[gitlab-shell.http-settings] +[gitlab] +secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret" +gitlab_url = "http://localhost:8080" +[gitlab.http-settings] # read_timeout = 300 # user = someone # password = somepass |