Commit 187b4964 authored by Robert Schilling's avatar Robert Schilling

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

parents 78da7b1c d12a57f0
...@@ -122,7 +122,6 @@ v 7.10.0 ...@@ -122,7 +122,6 @@ v 7.10.0
- Fixed link paths for HTTP and SSH on the admin project view (Jeremy Maziarz) - Fixed link paths for HTTP and SSH on the admin project view (Jeremy Maziarz)
- Fix and improve help rendering (Sullivan Sénéchal) - Fix and improve help rendering (Sullivan Sénéchal)
- Fix final line in EmailsOnPush email diff being rendered as error. - 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. - Prevent duplicate Buildkite service creation.
- Fix git over ssh errors 'fatal: protocol error: bad line length character' - 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 - Automatically setup GitLab CI project for forks if origin project has GitLab CI enabled
......
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
# 2. Update gitlab -> host with your fully qualified domain name # 2. Update gitlab -> host with your fully qualified domain name
# 3. Update gitlab -> email_from # 3. Update gitlab -> email_from
# 4. If you installed Git from source, change git -> bin_path to /usr/local/bin/git # 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 # 5. Review this configuration file for other settings you may want to adjust
production: &base production: &base
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment