diff options
author | Alejandro Rodríguez <alejorro70@gmail.com> | 2018-10-16 20:10:52 +0300 |
---|---|---|
committer | Alejandro Rodríguez <alejorro70@gmail.com> | 2018-10-16 20:10:52 +0300 |
commit | e8e7e016cb840e5ff4099a0eb0df7db7a0c37ba5 (patch) | |
tree | ce6e6abe9b32ad0ab5761f8caa1449fd18f06617 | |
parent | 3c61501051072811471605a67bb761ccaa2f5146 (diff) | |
parent | 55d9727623c55897cadfcbb36c521558b55b6a66 (diff) |
Merge branch '1368-config-toml-order' into 'master'
Fix order in config.toml.example
Closes #1368
See merge request gitlab-org/gitaly!923
-rw-r--r-- | changelogs/unreleased/1368-config-toml-order.yml | 5 | ||||
-rw-r--r-- | config.toml.example | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/changelogs/unreleased/1368-config-toml-order.yml b/changelogs/unreleased/1368-config-toml-order.yml new file mode 100644 index 000000000..2fcdc8a34 --- /dev/null +++ b/changelogs/unreleased/1368-config-toml-order.yml @@ -0,0 +1,5 @@ +--- +title: Fix order in config.toml.example +merge_request: 923 +author: +type: fixed diff --git a/config.toml.example b/config.toml.example index 0822e8ca1..2818531d5 100644 --- a/config.toml.example +++ b/config.toml.example @@ -8,14 +8,14 @@ bin_dir = "/home/git/gitaly" # # Optional: listen on a TCP socket. This is insecure (no authentication) # listen_addr = "localhost:9999" +# # Optional: export metrics via Prometheus +# prometheus_listen_addr = "localhost:9236" + # # Optional: authenticate Gitaly requests using a shared secret # [auth] # token = 'abc123secret' # transitioning = false # Set `transitioning` to true to temporarily allow unauthenticated while rolling out authentication. -# # Optional: export metrics via Prometheus -# prometheus_listen_addr = "localhost:9236" - # # Git executable settings # [git] # bin_path = "/usr/bin/git" |