Commit 9f372fc1 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis Committed by Alejandro Rodríguez

Merge branch 'revert-a0d5bb0b' into 'master'

Revert "Merge branch 'docs/jira-old' into 'master'"

See merge request !7531
parent f028fa6f
...@@ -57,9 +57,9 @@ class JiraService < IssueTrackerService ...@@ -57,9 +57,9 @@ class JiraService < IssueTrackerService
end end
def help def help
'See the ' \ 'You need to configure JIRA before enabling this service. For more details
'[integration doc](http://doc.gitlab.com/ce/integration/external-issue-tracker.html) '\ read the
'for details.' [JIRA service documentation](https://docs.gitlab.com/ce/project_services/jira.html).'
end end
def title def title
......
...@@ -5,7 +5,7 @@ trackers and external authentication. ...@@ -5,7 +5,7 @@ trackers and external authentication.
See the documentation below for details on how to configure these services. See the documentation below for details on how to configure these services.
- [Jira](../project_services/jira.md) Integrate with the JIRA issue tracker - [JIRA](../project_services/jira.md) Integrate with the JIRA issue tracker
- [External issue tracker](external-issue-tracker.md) Redmine, JIRA, etc. - [External issue tracker](external-issue-tracker.md) Redmine, JIRA, etc.
- [LDAP](ldap.md) Set up sign in via LDAP - [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 - [OmniAuth](omniauth.md) Sign in via Twitter, GitHub, GitLab.com, Google, Bitbucket, Facebook, Shibboleth, SAML, Crowd and Azure
......
# GitLab JIRA integration
This document was moved under [project_services/jira](../project_services/jira.md).
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment