will/github-changelog-generator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/1.3.10'

Browse Source
This commit is contained in:
Petr Korolev 2015-03-18 10:27:30 +02:00
commit 1232f339a0
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/github_changelog_generator.rb
View File

@ -36,7 +36,6 @@ module GitHubChangelogGenerator
if @options[:pulls] if @options[:pulls]
@pull_requests = self.get_filtered_pull_requests @pull_requests = self.get_filtered_pull_requests
self.fetch_merged_at_pull_requests
else else
@pull_requests = [] @pull_requests = []
end end
@ -138,12 +137,12 @@ module GitHubChangelogGenerator
def get_filtered_pull_requests def get_filtered_pull_requests
pull_requests = @pull_requests self.fetch_merged_at_pull_requests
filtered_pull_requests = pull_requests
filtered_pull_requests = @pull_requests.select {|pr| pr[:merged_at] != nil }
unless @options[:include_labels].nil? unless @options[:include_labels].nil?
filtered_pull_requests = pull_requests.select { |issue| filtered_pull_requests = @pull_requests.select { |issue|
#add all labels from @options[:incluse_labels] array #add all labels from @options[:incluse_labels] array
(issue.labels.map { |label| label.name } & @options[:include_labels]).any? (issue.labels.map { |label| label.name } & @options[:include_labels]).any?
} }
@ -157,7 +156,7 @@ module GitHubChangelogGenerator
end end
if @options[:add_issues_wo_labels] if @options[:add_issues_wo_labels]
issues_wo_labels = pull_requests.select { issues_wo_labels = @pull_requests.select {
# add issues without any labels # add issues without any labels
|issue| !issue.labels.map { |label| label.name }.any? |issue| !issue.labels.map { |label| label.name }.any?
} }
@ -332,7 +331,7 @@ module GitHubChangelogGenerator
if filtered_issues.empty? && filtered_pull_requests.empty? && newer_tag.nil? if filtered_issues.empty? && filtered_pull_requests.empty? && newer_tag.nil?
# do not generate empty unreleased section # do not generate empty unreleased section
return nil return ''
end end
self.create_log(filtered_pull_requests, filtered_issues, newer_tag, older_tag_name) self.create_log(filtered_pull_requests, filtered_issues, newer_tag, older_tag_name)

2
lib/github_changelog_generator/version.rb
View File

@ -1,3 +1,3 @@
module GitHubChangelogGenerator module GitHubChangelogGenerator
VERSION = '1.3.9' VERSION = '1.3.10'
end end