summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2015-01-22 17:27:55 -0800
committerValery Sizov <valery@gitlab.com>2015-01-22 17:27:55 -0800
commit0d18b43a6c1f758f95b7a8f0aace65e9a97c3c7e (patch)
tree058b1edb1a6340d4b605a868aab380738d8eca19
parentbd6d7d8aa2505877d5b505b49b4140aa88e999b4 (diff)
parentb5dd44d86462b1acab216e9f22bea40af8434d74 (diff)
downloadgitlab-ci-0d18b43a6c1f758f95b7a8f0aace65e9a97c3c7e.tar.gz
Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ci
-rw-r--r--config/application.yml.example4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/application.yml.example b/config/application.yml.example
index c84ae5c..acdc993 100644
--- a/config/application.yml.example
+++ b/config/application.yml.example
@@ -41,6 +41,10 @@ test:
url: 'http://demo.gitlab.com/'
app_id: 'id'
app_secret: 'secret'
+ gitlab_ci:
+ host: localhost
+ port: 80
+ https: false
production:
<<: *defaults