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 /doc/integration/README.md | |
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 'doc/integration/README.md')
-rw-r--r-- | doc/integration/README.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/integration/README.md b/doc/integration/README.md index c2fd299db07..a928b74f9b8 100644 --- a/doc/integration/README.md +++ b/doc/integration/README.md @@ -5,7 +5,7 @@ trackers and external authentication. See the documentation below for details on how to configure these services. -- [Jira](../project_services/jira.md) Integrate with the JIRA issue tracker +- [JIRA](jira.md) Integrate with the JIRA issue tracker - [External issue tracker](external-issue-tracker.md) Redmine, JIRA, etc. - [LDAP](ldap.md) Set up sign in via LDAP - [OmniAuth](omniauth.md) Sign in via Twitter, GitHub, GitLab.com, Google, Bitbucket, Facebook, Shibboleth, SAML, Crowd and Azure |