summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-02-07 22:42:51 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-02-07 22:42:51 +0000
commit66fe68ac7c29fedfd000373b99e6f9616d72ff8e (patch)
tree5caba5b84c407e3c26c9905a8c831ccfd070068a
parent2ad872382b49d4802a9ea5e2c7e8773949d83b2a (diff)
parented093f1ef0a75cd6d4b292f94ae11383f0afd9d6 (diff)
downloadgitlab-ce-66fe68ac7c29fedfd000373b99e6f9616d72ff8e.tar.gz
Merge branch 'jira_when_ce' into 'master'
Clarify when JIRA service was backported to CE See merge request !2744
-rw-r--r--doc/project_services/jira.md9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/project_services/jira.md b/doc/project_services/jira.md
index d6b2e7f521b..7c12557a321 100644
--- a/doc/project_services/jira.md
+++ b/doc/project_services/jira.md
@@ -1,5 +1,12 @@
# GitLab JIRA integration
+_**Note:**
+Full JIRA integration was previously exclusive to GitLab Enterprise Edition.
+With [GitLab 8.3 forward][8_3_post], this feature in now [backported][jira-ce]
+to GitLab Community Edition as well._
+
+---
+
GitLab can be configured to interact with [JIRA Core] either using an
on-premises instance or the SaaS solution that Atlassian offers. Configuration
happens via username and password on a per-project basis. Connecting to a JIRA
@@ -210,3 +217,5 @@ You can see from the above image that there are four references to GitLab:
[services-templates]: ../project_services/services_templates.md "Services templates documentation"
[JIRA Core]: https://www.atlassian.com/software/jira/core "The JIRA Core website"
+[jira-ce]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2146 "MR - Backport JIRA service"
+[8_3_post]: https://about.gitlab.com/2015/12/22/gitlab-8-3-released/ "GitLab 8.3 release post"