summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-03-31 10:55:18 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-03-31 10:55:18 +0000
commitadb1cf82b64d6411bfbf0938a98b01b36ea1d20b (patch)
treeb386785464a239cdbafabb918e45d63b9d607738
parentacc2a03d924ec0b8fde8231e258830c103dffc59 (diff)
parent653d5f4901f610876449a11fb7782362f826d15a (diff)
downloadgitlab-ce-adb1cf82b64d6411bfbf0938a98b01b36ea1d20b.tar.gz
Merge branch '29929-jira-doc' into 'master'
Fix link to Jira service documentation Closes #29929 See merge request !10366
-rw-r--r--app/models/project_services/jira_service.rb2
-rw-r--r--changelogs/unreleased/29929-jira-doc.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb
index eef403dba92..3b90fd1c2c7 100644
--- a/app/models/project_services/jira_service.rb
+++ b/app/models/project_services/jira_service.rb
@@ -62,7 +62,7 @@ class JiraService < IssueTrackerService
def help
"You need to configure JIRA before enabling this service. For more details
read the
- [JIRA service documentation](#{help_page_url('project_services/jira')})."
+ [JIRA service documentation](#{help_page_url('user/project/integrations/jira')})."
end
def title
diff --git a/changelogs/unreleased/29929-jira-doc.yml b/changelogs/unreleased/29929-jira-doc.yml
new file mode 100644
index 00000000000..f79dcd84634
--- /dev/null
+++ b/changelogs/unreleased/29929-jira-doc.yml
@@ -0,0 +1,4 @@
+---
+title: Fix link to Jira service documentation
+merge_request:
+author: