diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2015-05-03 16:22:37 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2015-05-03 16:22:37 +0000 |
| commit | 05ca93866adfc8a67676a5793c4fba1bc0e26c47 (patch) | |
| tree | 9d98cb23ab75a206db7e6f36e48ea33da18de0c8 | |
| parent | be05a9b938ba79a28f434e3c54e85c9df40bb5c8 (diff) | |
| parent | dc2b380da6b36bd9a8b80c9fb94a226ddee2e5b2 (diff) | |
| download | gitlab-ce-05ca93866adfc8a67676a5793c4fba1bc0e26c47.tar.gz | |
Merge branch 'fix-config-yml-example' into 'master'
Fix config template from parse errors
62aa05dd0cc5b6e added comments that were not commented out. CI test builds do a `cp gitlab.yml.example gitlab.yml` and thus were failing.
See merge request !602
| -rw-r--r-- | config/gitlab.yml.example | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 93e75b46856..bd2081688d1 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -12,9 +12,9 @@ # 2. Update gitlab -> host with your fully qualified domain name # 3. Update gitlab -> email_from # 4. If you installed Git from source, change git -> bin_path to /usr/local/bin/git - IMPORTANT: If Git was installed in a different location use that instead. - You can check with `which git`. If a wrong path of Git is specified, it will - result in various issues such as failures of GitLab CI builds. +# IMPORTANT: If Git was installed in a different location use that instead. +# You can check with `which git`. If a wrong path of Git is specified, it will +# result in various issues such as failures of GitLab CI builds. # 5. Review this configuration file for other settings you may want to adjust production: &base |