diff options
| author | Sami Hiltunen <shiltunen@gitlab.com> | 2020-05-20 16:17:11 +0300 |
|---|---|---|
| committer | Sami Hiltunen <shiltunen@gitlab.com> | 2020-05-20 16:17:11 +0300 |
| commit | 51d96bd920b4f07e87e84fd79c72a9b3c2f9902e (patch) | |
| tree | 6b05a76921d1126ae47fd8262003b6c17f001e8e /config.toml.example | |
| parent | 5a24d9619e2472d70a9ca4fc8d6d5ec7a9fdbffa (diff) | |
Revert "Merge branch 'jc-change-to-hooks' into 'master'"
This reverts commit 5a24d9619e2472d70a9ca4fc8d6d5ec7a9fdbffa, reversing
changes made to 4cd8d0c5614cafc3ca41f3473004adaeabc77e24.
Diffstat (limited to 'config.toml.example')
| -rw-r--r-- | config.toml.example | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/config.toml.example b/config.toml.example index d89f2da8a..aaab83c21 100644 --- a/config.toml.example +++ b/config.toml.example @@ -86,14 +86,11 @@ dir = "/home/git/gitaly/ruby" [gitlab-shell] # The directory where gitlab-shell is installed dir = "/home/git/gitlab-shell" - -[hooks] -custom_hooks_dir = "/home/git/custom_hooks" - -[gitlab] secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret" +custom_hooks_dir = "/home/git/custom_hooks" gitlab_url = "http://localhost:8080" -[gitlab.http-settings] + +[gitlab-shell.http-settings] # read_timeout = 300 # user = someone # password = somepass |