diff options
| author | Jarka Kadlecova <jarka@gitlab.com> | 2017-07-10 09:38:42 +0200 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-07-24 08:13:43 +0200 |
| commit | 7bee7b848aab883a6869e1fd2fbb9e66182d2023 (patch) | |
| tree | 286029930e7c9af9402a752a1dd6f2ab9c607776 /lib/gitlab/reference_extractor.rb | |
| parent | 2fa22a07296223c1239bfab94654487cca222097 (diff) | |
| download | gitlab-ce-7bee7b848aab883a6869e1fd2fbb9e66182d2023.tar.gz | |
Support both internal and external issue trackers
Diffstat (limited to 'lib/gitlab/reference_extractor.rb')
| -rw-r--r-- | lib/gitlab/reference_extractor.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/gitlab/reference_extractor.rb b/lib/gitlab/reference_extractor.rb index 7668ecacc4b..f5b757ace77 100644 --- a/lib/gitlab/reference_extractor.rb +++ b/lib/gitlab/reference_extractor.rb @@ -33,7 +33,12 @@ module Gitlab def issues if project && project.jira_tracker? - @references[:external_issue] ||= references(:external_issue) + if project.issues_enabled? + @references[:all_issues] ||= references(:external_issue) + references(:issue) + else + @references[:external_issue] ||= references(:external_issue) + + references(:issue).select { |i| i.project_id != project.id } + end else @references[:issue] ||= references(:issue) end |