From b700b84c2b076bffba735ab5be46e71901525189 Mon Sep 17 00:00:00 2001 From: Umberto Nicoletti Date: Tue, 16 May 2017 18:14:09 +0200 Subject: [PATCH 1/2] use closed_at and merged_at when filtering issues/prs --- .../generator/generator_generation.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/github_changelog_generator/generator/generator_generation.rb b/lib/github_changelog_generator/generator/generator_generation.rb index b8b987873..9843b9e51 100644 --- a/lib/github_changelog_generator/generator/generator_generation.rb +++ b/lib/github_changelog_generator/generator/generator_generation.rb @@ -95,8 +95,8 @@ def generate_log_between_tags(older_tag, newer_tag) # # @return [Array] filtered issues and pull requests def filter_issues_for_tags(newer_tag, older_tag) - filtered_pull_requests = delete_by_time(@pull_requests, "actual_date", older_tag, newer_tag) - filtered_issues = delete_by_time(@issues, "actual_date", older_tag, newer_tag) + filtered_pull_requests = delete_by_time(@pull_requests, "merged_at", older_tag, newer_tag) + filtered_issues = delete_by_time(@issues, "closed_at", older_tag, newer_tag) newer_tag_name = newer_tag.nil? ? nil : newer_tag["name"] From 01d7820f84a9554c03d89ca3ba7fb7d3ef2b213a Mon Sep 17 00:00:00 2001 From: Umberto Nicoletti Date: Tue, 16 May 2017 22:01:34 +0200 Subject: [PATCH 2/2] document use of closed_at and merged_at --- .../generator/generator_generation.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/github_changelog_generator/generator/generator_generation.rb b/lib/github_changelog_generator/generator/generator_generation.rb index 9843b9e51..c6c268f00 100644 --- a/lib/github_changelog_generator/generator/generator_generation.rb +++ b/lib/github_changelog_generator/generator/generator_generation.rb @@ -91,7 +91,8 @@ def generate_log_between_tags(older_tag, newer_tag) create_log_for_tag(filtered_pull_requests, filtered_issues, newer_tag, older_tag_name) end - # Apply all filters to issues and pull requests + # Filters issues and pull requests based on, respectively, `closed_at` and `merged_at` + # timestamp fields. # # @return [Array] filtered issues and pull requests def filter_issues_for_tags(newer_tag, older_tag)