diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2015-05-03 15:01:09 +0200 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2015-05-03 15:01:09 +0200 |
| commit | 187b4964259efe6d55a668173ee3ed32d79657c3 (patch) | |
| tree | c466c8085a71fcc1087b79f5cebbfc5a9e05ef51 | |
| parent | 78da7b1c486cb5c07a51e727a497e882bea4bc55 (diff) | |
| parent | d12a57f07b270a64be22513f69aeca3bac54641a (diff) | |
| download | gitlab-ce-187b4964259efe6d55a668173ee3ed32d79657c3.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | config/gitlab.yml.example | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 87b3954ef4f..6c73e8e1637 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -122,7 +122,6 @@ v 7.10.0 - Fixed link paths for HTTP and SSH on the admin project view (Jeremy Maziarz) - Fix and improve help rendering (Sullivan Sénéchal) - Fix final line in EmailsOnPush email diff being rendered as error. - - Authometic setup GitLab CI project for forks if origin project has GitLab CI enabled - Prevent duplicate Buildkite service creation. - Fix git over ssh errors 'fatal: protocol error: bad line length character' - Automatically setup GitLab CI project for forks if origin project has GitLab CI enabled diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 93a01c0723f..93e75b46856 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -12,6 +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. # 5. Review this configuration file for other settings you may want to adjust production: &base |