diff --git a/tasks/release/ChangelogController.php b/tasks/release/ChangelogController.php index 2d88bd58ac..3ad827cc39 100644 --- a/tasks/release/ChangelogController.php +++ b/tasks/release/ChangelogController.php @@ -50,7 +50,10 @@ class ChangelogController { private function renderList(array $issues, $field) { $messages = []; foreach ($issues as $issue) { - if (!isset($issue['fields'][$field])) { + if ( + !isset($issue['fields'][$field]) + || ($issue['fields']['resolution']['id'] === Jira::WONT_DO_RESOLUTION_ID) + ) { continue; } $messages[] = "* " . $this->sanitizePunctuation($issue['fields'][$field], ';'); diff --git a/tasks/release/Jira.php b/tasks/release/Jira.php index 8e0bc47df4..d199ba7db3 100644 --- a/tasks/release/Jira.php +++ b/tasks/release/Jira.php @@ -7,6 +7,8 @@ class Jira { const CHANGELOG_FIELD_ID = 'customfield_10500'; const RELEASENOTE_FIELD_ID = 'customfield_10504'; + const WONT_DO_RESOLUTION_ID = '10001'; + const PROJECT_MAILPOET = 'MAILPOET'; const PROJECT_PREMIUM = 'PREMIUM'; @@ -60,7 +62,7 @@ class Jira { function getIssuesDataForVersion($version) { $changelog_id = self::CHANGELOG_FIELD_ID; $release_note_id = self::RELEASENOTE_FIELD_ID; - $issues_data = $this->search("fixVersion={$version['id']}", ['key', $changelog_id, $release_note_id, 'status']); + $issues_data = $this->search("fixVersion={$version['id']}", ['key', $changelog_id, $release_note_id, 'status', 'resolution']); // Sort issues by importance of change (Added -> Updated -> Improved -> Changed -> Fixed -> Others) usort($issues_data['issues'], function($a, $b) use ($changelog_id) { $order = array_flip(['added', 'updat', 'impro', 'chang', 'fixed']);