Merge branch 'revert-a0d5bb0b' into 'master'

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

See merge request !7531

app/models/project_services/jira_service.rb

@@ -57,9 +57,9 @@ class JiraService < IssueTrackerService
   end
   def help
-    'See the ' \
-    '[integration doc](http://doc.gitlab.com/ce/integration/external-issue-tracker.html) '\
-    'for details.'
+    'You need to configure JIRA before enabling this service. For more details
+    read the
+    [JIRA service documentation](https://docs.gitlab.com/ce/project_services/jira.html).'
   end
   def title

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](../project_services/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

doc/integration/jira.md

-# GitLab JIRA integration
-
-This document was moved under [project_services/jira](../project_services/jira.md).