From 8f8be4740d30ccda641be894029edef1afb4d3b4 Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Tue, 3 Mar 2015 19:19:08 +0200 Subject: [PATCH] fix #59 --- CHANGELOG.md | 82 ------------------------------- lib/github_changelog_generator.rb | 9 ++-- 2 files changed, 4 insertions(+), 87 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 754c9dc..632886e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,18 +4,10 @@ [Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.3.2...1.3.3) -**Closed issues:** - -- Add \# character to wrapping list. [\#58](https://github.com/skywinder/Github-Changelog-Generator/issues/58) - ## [1.3.2](https://github.com/skywinder/Github-Changelog-Generator/tree/1.3.2) (2015-03-03) [Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.3.1...1.3.2) -**Fixed bugs:** - -- generation failed if github commit api return `404 Not Found` [\#57](https://github.com/skywinder/Github-Changelog-Generator/issues/57) - ## [1.3.1](https://github.com/skywinder/Github-Changelog-Generator/tree/1.3.1) (2015-02-27) [Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.3.0...1.3.1) @@ -24,20 +16,6 @@ [Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.2.8...1.3.0) -**Implemented enhancements:** - -- Do not show `Unreleased` section, when it's empty. [\#55](https://github.com/skywinder/Github-Changelog-Generator/issues/55) - -- Separate list exclude and include labels [\#52](https://github.com/skywinder/Github-Changelog-Generator/issues/52) - -- Unreleased issues in separate section [\#47](https://github.com/skywinder/Github-Changelog-Generator/issues/47) - -- Separate by lists: Enhancements, Bugs, Pull requests. [\#31](https://github.com/skywinder/Github-Changelog-Generator/issues/31) - -**Fixed bugs:** - -- Test pull request with invalid label \(\#26\) in changelog appeared. [\#44](https://github.com/skywinder/Github-Changelog-Generator/issues/44) - **Merged pull requests:** - Implement filtering of Pull Requests by milestones [\#50](https://github.com/skywinder/Github-Changelog-Generator/pull/50) ([skywinder](https://github.com/skywinder)) @@ -46,10 +24,6 @@ [Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.2.7...1.2.8) -**Closed issues:** - -- Bugs, that closed simultaneously with push not appeared in correct version. [\#37](https://github.com/skywinder/Github-Changelog-Generator/issues/37) - **Merged pull requests:** - Feature/fix 37 [\#49](https://github.com/skywinder/Github-Changelog-Generator/pull/49) ([skywinder](https://github.com/skywinder)) @@ -76,14 +50,6 @@ [Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.2.4...1.2.5) -**Implemented enhancements:** - -- Use milestone to specify in which version bug was fixed [\#22](https://github.com/skywinder/Github-Changelog-Generator/issues/22) - -**Fixed bugs:** - -- Error when trying to generate log for repo without tags [\#32](https://github.com/skywinder/Github-Changelog-Generator/issues/32) - **Merged pull requests:** - PrettyPrint class is included using lowercase 'pp' [\#43](https://github.com/skywinder/Github-Changelog-Generator/pull/43) ([schwing](https://github.com/schwing)) @@ -94,12 +60,6 @@ [Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.2.3...1.2.4) -**Fixed bugs:** - -- Sometimes user is NULL during merges [\#41](https://github.com/skywinder/Github-Changelog-Generator/issues/41) - -- Crash when try generate log for rails [\#35](https://github.com/skywinder/Github-Changelog-Generator/issues/35) - **Merged pull requests:** - Implement async fetching [\#39](https://github.com/skywinder/Github-Changelog-Generator/pull/39) ([skywinder](https://github.com/skywinder)) @@ -108,16 +68,6 @@ [Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.2.2...1.2.3) -**Implemented enhancements:** - -- Add ability to run with one parameter instead -u -p [\#38](https://github.com/skywinder/Github-Changelog-Generator/issues/38) - -- Detailed output [\#33](https://github.com/skywinder/Github-Changelog-Generator/issues/33) - -**Fixed bugs:** - -- Docs lacking or basic behavior not as advertised [\#30](https://github.com/skywinder/Github-Changelog-Generator/issues/30) - **Merged pull requests:** - Fix crash when user is NULL [\#40](https://github.com/skywinder/Github-Changelog-Generator/pull/40) ([skywinder](https://github.com/skywinder)) @@ -126,10 +76,6 @@ [Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.2.1...1.2.2) -**Fixed bugs:** - -- Encapsulate \[ \> \* \_ \ \] signs in issues names [\#34](https://github.com/skywinder/Github-Changelog-Generator/issues/34) - **Merged pull requests:** - Add a Bitdeli Badge to README [\#36](https://github.com/skywinder/Github-Changelog-Generator/pull/36) ([bitdeli-chef](https://github.com/bitdeli-chef)) @@ -138,10 +84,6 @@ [Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.2.0...1.2.1) -**Fixed bugs:** - -- Script fills changelog only for first 30 tags. [\#20](https://github.com/skywinder/Github-Changelog-Generator/issues/20) - **Merged pull requests:** - Issues for last tag not in list [\#29](https://github.com/skywinder/Github-Changelog-Generator/pull/29) ([skywinder](https://github.com/skywinder)) @@ -164,10 +106,6 @@ [Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.1.2...1.1.4) -**Implemented enhancements:** - -- Implement ability to retrieve GitHub token from ENV variable \(to not put it to script directly\) [\#19](https://github.com/skywinder/Github-Changelog-Generator/issues/19) - **Merged pull requests:** - Sort tags by date [\#23](https://github.com/skywinder/Github-Changelog-Generator/pull/23) ([skywinder](https://github.com/skywinder)) @@ -198,16 +136,6 @@ [Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.0.1...1.1.0) -**Implemented enhancements:** - -- Detect username and project form origin [\#11](https://github.com/skywinder/Github-Changelog-Generator/issues/11) - -**Fixed bugs:** - -- Bug with wrong credentials in 1.0.1 [\#12](https://github.com/skywinder/Github-Changelog-Generator/issues/12) - -- Markdown formating in the last line wrong [\#9](https://github.com/skywinder/Github-Changelog-Generator/issues/9) - ## [1.0.1](https://github.com/skywinder/Github-Changelog-Generator/tree/1.0.1) (2014-11-10) [Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.0.0...1.0.1) @@ -220,16 +148,6 @@ [Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/0.1.0...1.0.0) -**Implemented enhancements:** - -- Add support for fixed issues and implemented enchanments. [\#6](https://github.com/skywinder/Github-Changelog-Generator/issues/6) - -- Implement option to specify output filename [\#4](https://github.com/skywinder/Github-Changelog-Generator/issues/4) - -**Fixed bugs:** - -- Last tag not appeared in changelog [\#5](https://github.com/skywinder/Github-Changelog-Generator/issues/5) - **Merged pull requests:** - Add support for issues in CHANGELOG [\#7](https://github.com/skywinder/Github-Changelog-Generator/pull/7) ([skywinder](https://github.com/skywinder)) diff --git a/lib/github_changelog_generator.rb b/lib/github_changelog_generator.rb index 61d6eb4..785a81f 100755 --- a/lib/github_changelog_generator.rb +++ b/lib/github_changelog_generator.rb @@ -499,12 +499,11 @@ module GitHubChangelogGenerator log += generate_log_from_array(enhancement_a, @options[:enhancement_prefix]) log += generate_log_from_array(bugs_a, @options[:bug_prefix]) log += generate_log_from_array(issues_a, @options[:issue_prefix]) + end - if @options[:pulls] - # Generate pull requests: - log += generate_log_from_array(pull_requests, @options[:merge_prefix]) - end - + if @options[:pulls] + # Generate pull requests: + log += generate_log_from_array(pull_requests, @options[:merge_prefix]) end log