diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-28 11:41:20 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-28 11:41:20 +0000 |
| commit | 292c982e346843f8979ec5b302a8ad01dd09917a (patch) | |
| tree | defc3359cc7ff3336e5c8df97c72693822549adf /config | |
| parent | 8b0cdf4c832ca5f40a6c24207021ed122984b280 (diff) | |
| parent | 3d7a287c55e456b4fb3c4480147ef9b697a0f42c (diff) | |
| download | gitlab-ce-292c982e346843f8979ec5b302a8ad01dd09917a.tar.gz | |
Merge branch 'issue_1008_1' into 'master'
Jira refactoring to jira gem
part of gitlab-org/gitlab-ee#1008
Original MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2572/commits
See merge request !6598
Diffstat (limited to 'config')
| -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: |