diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-18 18:23:32 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-18 18:23:32 +0000 |
| commit | 764a269a1e5b636d7f4ef932991b5dcc8afda213 (patch) | |
| tree | 30a23ab591d99dc926419e0db62d12088ad4bbb7 | |
| parent | 6dfd88a145b7c7f9dc798d888a2aa4ad5c1c54b7 (diff) | |
| parent | e1e9c307a6a5f0c3125fdb769ef065c55587782c (diff) | |
| download | gitlab-ce-764a269a1e5b636d7f4ef932991b5dcc8afda213.tar.gz | |
Merge branch 'add-link-to-ee-jenkins' into 'master'
Add link to ee jenkins
/cc @marin
| -rw-r--r-- | doc/integration/README.md | 2 | ||||
| -rw-r--r-- | doc/integration/external-issue-tracker.md | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/doc/integration/README.md b/doc/integration/README.md index 8318113ce92..4773dd8fffb 100644 --- a/doc/integration/README.md +++ b/doc/integration/README.md @@ -7,3 +7,5 @@ See the documentation below for details on how to configure these services. + [LDAP](ldap.md) Set up sign in via LDAP + [OmniAuth](omniauth.md) Sign in via Twitter, GitHub, and Google via OAuth. + [Slack](slack.md) Integrate with the Slack chat service + +Jenkins support is [available in GitLab EE](http://doc.gitlab.com/ee/integration/jenkins.html). diff --git a/doc/integration/external-issue-tracker.md b/doc/integration/external-issue-tracker.md index e490b2f8846..1b531aeeda7 100644 --- a/doc/integration/external-issue-tracker.md +++ b/doc/integration/external-issue-tracker.md @@ -7,3 +7,5 @@ GitLab has a great issue tracker but you can also use an external issue tracker  You can configure the integration in the gitlab.yml configuration file. + +Support to add your commits to the Jira ticket automatically is [available in GitLab EE](http://doc.gitlab.com/ee/integration/jira.html). |