summaryrefslogtreecommitdiff
path: root/config/application.yml.example
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2015-06-11 15:18:28 +0200
committerMarin Jankovski <maxlazio@gmail.com>2015-06-11 15:18:28 +0200
commit01ddea3a8439f79b5c8a6ba07b10ca6b4a3c09aa (patch)
treee72f212bf605875ea298398738185384feaf6e65 /config/application.yml.example
parente744d06515eb4195115d451b744009aa4dd24d1f (diff)
downloadgitlab-ci-note_about_config.tar.gz
Add a note that changing example configuration files requires changing omnibus-gitlab.note_about_config
Diffstat (limited to 'config/application.yml.example')
-rw-r--r--config/application.yml.example17
1 files changed, 10 insertions, 7 deletions
diff --git a/config/application.yml.example b/config/application.yml.example
index 760cab4..8d345b3 100644
--- a/config/application.yml.example
+++ b/config/application.yml.example
@@ -1,10 +1,13 @@
+# If you change this file in a Merge Request, please also create
+# a MR on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
+
defaults: &defaults
gitlab_server:
url: 'https://gitlab.example.com/' # Replace with your gitlab server url
app_id: ''
app_secret: ''
- ## Gitlab CI settings
+ ## Gitlab CI settings
gitlab_ci:
## Web server settings
host: localhost
@@ -14,18 +17,18 @@ defaults: &defaults
## Email settings
# Email address used in the "From" field in mails sent by GitLab-CI
email_from: gitlab-ci@localhost
-
+
# Email address of your support contact (default: same as email_from)
support_email: support@localhost
-
- # Default project notifications settings:
+
+ # Default project notifications settings:
#
# Send emails only on broken builds (default: true)
# all_broken_builds: true
- #
+ #
# Add pusher to recipients list (default: false)
# add_pusher: true
-
+
gravatar:
enabled: true
plain_url: "http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm"
@@ -55,7 +58,7 @@ development:
test:
<<: *defaults
gitlab_server:
- url: 'http://demo.gitlab.com/'
+ url: 'http://demo.gitlab.com/'
app_id: 'id'
app_secret: 'secret'
gitlab_ci: