From 726f8f79fb9d18140a1cc9d31be46c589dce9250 Mon Sep 17 00:00:00 2001 From: Tom Duffield Date: Sun, 20 Nov 2016 00:29:58 -0600 Subject: [PATCH] Don't show untagged issues when desired When `add_issues_wo_labels` is false, do not include issues that do not have any labels in the CHANGELOG (per documentation). Signed-off-by: Tom Duffield --- .../generator/generator_processor.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/github_changelog_generator/generator/generator_processor.rb b/lib/github_changelog_generator/generator/generator_processor.rb index 7042c05..8721443 100644 --- a/lib/github_changelog_generator/generator/generator_processor.rb +++ b/lib/github_changelog_generator/generator/generator_processor.rb @@ -126,19 +126,17 @@ module GitHubChangelogGenerator # @return [Array] filtered array of issues def include_issues_by_labels(issues) filtered_issues = filter_by_include_labels(issues) - filtered_issues |= filter_wo_labels(issues) + filtered_issues = filter_wo_labels(filtered_issues) filtered_issues end # @return [Array] issues without labels or empty array if add_issues_wo_labels is false def filter_wo_labels(issues) if options[:add_issues_wo_labels] - issues_wo_labels = issues.reject do |issue| - issue["labels"].map { |l| l["name"] }.none? - end - return issues_wo_labels + issues + else + issues.reject { |issue| !issue["labels"].map { |l| l["name"] }.any? } end - [] end def filter_by_include_labels(issues)