diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-10-31 15:00:30 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-10-31 15:00:30 +0000 |
| commit | 1ff00cb2dd168d98b0d4f4995216ed909dae9349 (patch) | |
| tree | e25fe417a3a01e0bd73145475869a73e25c8a062 /config/gitlab.yml.example | |
| parent | decf0fefe17a574782d47504920b9a2cfc7b14dc (diff) | |
| parent | 490776517c394ced2780159fa3800e2accc27601 (diff) | |
| download | gitlab-ce-add-retry-limit-project-webhook.tar.gz | |
Merge branch 'master' into 'add-retry-limit-project-webhook'add-retry-limit-project-webhook
# Conflicts:
# app/workers/project_web_hook_worker.rb
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 114ceac8e1f..3451b68cea5 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -547,6 +547,10 @@ test: project_url: "http://redmine/projects/:issues_tracker_id" issues_url: "http://redmine/:project_id/:issues_tracker_id/:id" new_issue_url: "http://redmine/projects/:issues_tracker_id/issues/new" + jira: + title: "JIRA" + url: https://sample_company.atlasian.net + project_key: PROJECT ldap: enabled: false servers: |