diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-10 22:06:30 +0200 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-10 22:06:30 +0200 |
commit | d5fac1ced3daa33a7275aff9a4be88a741ee78c9 (patch) | |
tree | 06c308909f91d19de4c35946a678cb56b055f8e9 /config/gitlab.yml.example | |
parent | 2fd009d23810939a77ddc1716ab4250ee18826fa (diff) | |
parent | b4e84809e8170a43126507da0bc6a3b94c33804b (diff) | |
download | gitlab-ce-d5fac1ced3daa33a7275aff9a4be88a741ee78c9.tar.gz |
Merge remote-tracking branch 'origin/master' into retry-spinach-tests
Diffstat (limited to 'config/gitlab.yml.example')
-rw-r--r-- | config/gitlab.yml.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 0510e7df597..1048ef6e243 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -181,7 +181,7 @@ production: &base # host: registry.example.com # port: 5005 # api_url: http://localhost:5000/ # internal address to the registry, will be used by GitLab to directly communicate with API - # key_path: config/registry.key + # key: config/registry.key # path: shared/registry # issuer: gitlab-issuer |