diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-21 14:47:27 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-21 14:47:27 +0000 |
| commit | 545a943468c4a178eaedb13a9aed5d3afdaecd05 (patch) | |
| tree | c45108109efe7b819fcd3f95088cb3b55ea1e2c1 /app/models/merge_request.rb | |
| parent | 4b4cbf0ce4925e22a635e4432e7ac8602199fa5b (diff) | |
| parent | f177aaa5fa789654dc440d6ec4ae3546544c1401 (diff) | |
| download | gitlab-ce-545a943468c4a178eaedb13a9aed5d3afdaecd05.tar.gz | |
Merge branch 'backport_jira' into 'master'
Backport JIRA service
Fixes #3839
Move EE JIRA functionality back to CE.
- [x] Make it function in manual testing
- [x] Migrate JIRA-specific tests
- [x] Tests pass
- [x] Migrate documentation
- [x] Rollback to previous CE JIRA integration locally, activate on a project then try to migrate db and see if integration still works.
- [x] Final EE search for JIRA references
See merge request !2146
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index d7430d36c41..ac25d38eb63 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -335,7 +335,7 @@ class MergeRequest < ActiveRecord::Base issues = commits.flat_map { |c| c.closes_issues(current_user) } issues.push(*Gitlab::ClosingIssueExtractor.new(project, current_user). closed_by_message(description)) - issues.uniq + issues.uniq(&:id) else [] end |