summaryrefslogtreecommitdiff
path: root/config/gitlab.yml.example
diff options
context:
space:
mode:
authorAndrew8xx8 <avk@8xx8.ru>2013-02-11 18:17:43 +0400
committerAndrew8xx8 <avk@8xx8.ru>2013-02-28 16:11:13 +0400
commit0afdf39dbcc50eb5889be08e5b1aaefe162e456c (patch)
treecf78d15203985ca45dc18511451551cd0b6e9423 /config/gitlab.yml.example
parent62de22c142d0ad9d956e7f6dae2eef4559d38436 (diff)
downloadgitlab-ce-0afdf39dbcc50eb5889be08e5b1aaefe162e456c.tar.gz
New field added
Diffstat (limited to 'config/gitlab.yml.example')
-rw-r--r--config/gitlab.yml.example6
1 files changed, 1 insertions, 5 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 93824e86853..cc38b3a45ce 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -7,8 +7,6 @@
# 2. Replace gitlab -> host with your domain
# 3. Replace gitlab -> email_from
-<<<<<<< HEAD
-<<<<<<< HEAD
production: &base
#
# 1. GitLab app settings
@@ -43,9 +41,7 @@ production: &base
## External issues trackers
issues_tracker:
redmine:
- ## If not nil Issues link in project page will be replaced to this
- url: "http://redmine.sample"
- ## If not nil links from /#\d/ entities from commit messages will replaced to this
+ ## If not nil, links from /#\d/ entities from commit messages will replaced to this
## Use placeholders:
## :project_id - Gitlab project identifier
## :issues_tracker_id - Project Name or Id in external issue tracker