diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-06-15 10:42:24 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-06-15 10:42:24 +0300 |
| commit | 6617e9bbf3cd3de65dd93272a3da2ab1298779a5 (patch) | |
| tree | 29b5abcfe7d2de4772de9f2914633421c2faf9ad /CHANGELOG | |
| parent | 5890d3d5e6e2a865c9d0f2f1a2bee76ce558cd1b (diff) | |
| parent | d45112258e066da307975c17c5ca19ea9a17222b (diff) | |
Merge branch 'fix-post-receive-external-tracker' into 'master'
Fix post-receive errors on a push when an external issue tracker is configured
### What does this MR do?
This MR improves upon !766, fixing errors upon a git push that occur only when an external issue tracker (not JIRA) is used. This MR takes into account that external issue trackers, such as JIRA, may close issues. Disabling the processing of post-receive commits when an external issue tracker is configured seems like the wrong behavior.
### Why was this MR needed?
When a user adds an issue reference, the refactoring in 8f8a8ab and a6defd157 caused `project.get_issue` to be called, causing `ExternalIssue` to be returned when an external issue tracker was configured. This object does not have a `close` method, as needed in `CloseService`. Nor does it make sense to associate a `SystemNote` with this object.
GitLab EE uses a [special case for JIRA](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/app/services/git_push_service.rb#L87). I would recommend moving this logic into `CloseService` too.
### What are the relevant issue numbers?
* Closes #1700
* Closes #1720
See merge request !804
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index c5a625ed1df..aa6e12bafc9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.12.0 (unreleased) + - Fix post-receive errors on a push when an external issue tracker is configured (Stan Hu) - Update oauth button logos for Twitter and Google to recommended assets - Update browser gem to version 0.8.0 for IE11 support (Stan Hu) - Fix timeout when rendering file with thousands of lines. |