From 30b7f39c40e85af6e516664d2dd5855cb326a73b Mon Sep 17 00:00:00 2001 From: Alissa Bonas Date: Sun, 23 Aug 2015 18:08:07 +0300 Subject: [PATCH 1/2] Fix comparing pull requests between tags by merged_at field instead of actual_date field --- .../generator/generator_generation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github_changelog_generator/generator/generator_generation.rb b/lib/github_changelog_generator/generator/generator_generation.rb index 200cd4e8b..e08c6421d 100644 --- a/lib/github_changelog_generator/generator/generator_generation.rb +++ b/lib/github_changelog_generator/generator/generator_generation.rb @@ -115,7 +115,7 @@ 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_pull_requests = delete_by_time(@pull_requests, :merged_at, older_tag, newer_tag) filtered_issues = delete_by_time(@issues, :actual_date, older_tag, newer_tag) newer_tag_name = newer_tag.nil? ? nil : newer_tag["name"] From 905a04fb754abc52dd9e36497ee0befbeaa1bb80 Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Mon, 24 Aug 2015 11:22:17 +0300 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a901e7ab2..8d7c75ad1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Change Log +## [Unreleased](https://github.com/skywinder/github-changelog-generator/tree/HEAD) + +[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.7.0...HEAD) + +**Merged pull requests:** + +- Add a rake task [\#260](https://github.com/skywinder/github-changelog-generator/pull/260) ([raphink](https://github.com/raphink)) +- Add release\_url option [\#259](https://github.com/skywinder/github-changelog-generator/pull/259) ([raphink](https://github.com/raphink)) +- Add --since-tag, close [\#257](https://github.com/skywinder/github-changelog-generator/pull/257) ([raphink](https://github.com/raphink)) + ## [1.7.0](https://github.com/skywinder/github-changelog-generator/tree/1.7.0) (2015-07-16) [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.6.2...1.7.0)