summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJeroen Nijhof <jeroen@jeroennijhof.nl>2016-01-08 17:25:09 +0100
committerJeroen Nijhof <jeroen@jeroennijhof.nl>2016-01-08 17:25:09 +0100
commite0436005af0d567391031ebbf546877f7f525731 (patch)
tree7a65d829d33043a0dadd7f8fcda910542e7d2406 /app
parent2c37ae2f0a7612deb4bf93fb726c98cad60ca0aa (diff)
parentc1e974ed889dd31fbbddfa2daeb1a681043d5aa0 (diff)
downloadgitlab-ce-e0436005af0d567391031ebbf546877f7f525731.tar.gz
Merge gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'app')
-rw-r--r--app/models/project_services/jira_service.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb
index a1b77c61576..8a43a021819 100644
--- a/app/models/project_services/jira_service.rb
+++ b/app/models/project_services/jira_service.rb
@@ -40,15 +40,10 @@ class JiraService < IssueTrackerService
end
def help
- line1 = 'Setting `project_url`, `issues_url` and `new_issue_url` will '\
+ 'Setting `project_url`, `issues_url` and `new_issue_url` will '\
'allow a user to easily navigate to the Jira issue tracker. See the '\
'[integration doc](http://doc.gitlab.com/ce/integration/external-issue-tracker.html) '\
'for details.'
-
- line2 = 'Support for referencing commits and automatic closing of Jira issues directly '\
- 'from GitLab is [available in GitLab EE.](http://doc.gitlab.com/ee/integration/jira.html)'
-
- [line1, line2].join("\n\n")
end
def title