Merge branch 'release/1.8.5'

Rake task: Be able to set false value in config

CHANGELOG.md

@@ -1,5 +1,26 @@
 # Change Log
 
+## [1.8.4](https://github.com/skywinder/github-changelog-generator/tree/1.8.4) (2015-09-01)
+[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.8.3...1.8.4)
+
+**Fixed bugs:**
+
+- Sending OATH through -t fails [\#274](https://github.com/skywinder/github-changelog-generator/issues/274)
+
+## [1.8.3](https://github.com/skywinder/github-changelog-generator/tree/1.8.3) (2015-08-31)
+[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.8.2...1.8.3)
+
+**Merged pull requests:**
+
+- Do not alter pull\_requests while iterating on it [\#271](https://github.com/skywinder/github-changelog-generator/pull/271) ([raphink](https://github.com/raphink))
+
+## [1.8.2](https://github.com/skywinder/github-changelog-generator/tree/1.8.2) (2015-08-26)
+[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.8.1...1.8.2)
+
+**Closed issues:**
+
+- Output should not include security information [\#270](https://github.com/skywinder/github-changelog-generator/issues/270)
+
 ## [1.8.1](https://github.com/skywinder/github-changelog-generator/tree/1.8.1) (2015-08-25)
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.8.0...1.8.1)
 
@@ -234,16 +255,13 @@
 **Implemented enhancements:**
 
 - Use milestone to specify in which version bug was fixed [\#22](https://github.com/skywinder/github-changelog-generator/issues/22)
+- support enterprise github via command line options [\#42](https://github.com/skywinder/github-changelog-generator/pull/42) ([glenlovett](https://github.com/glenlovett))
 
 **Fixed bugs:**
 
 - Error when trying to generate log for repo without tags [\#32](https://github.com/skywinder/github-changelog-generator/issues/32)
 - PrettyPrint class is included using lowercase 'pp' [\#43](https://github.com/skywinder/github-changelog-generator/pull/43) ([schwing](https://github.com/schwing))
 
-**Merged pull requests:**
-
-- support enterprise github via command line options [\#42](https://github.com/skywinder/github-changelog-generator/pull/42) ([glenlovett](https://github.com/glenlovett))
-
 ## [1.2.4](https://github.com/skywinder/github-changelog-generator/tree/1.2.4) (2014-12-16)
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.2.3...1.2.4)
 

lib/github_changelog_generator/generator/generator.rb

@@ -120,22 +120,22 @@ module GitHubChangelogGenerator
         issues_a.push dict unless added
       end
 
+      added_pull_requests = []
       pull_requests.each do |dict|
-        added = false
         dict.labels.each do |label|
           if @options[:bug_labels].include? label.name
             bugs_a.push dict
-            added = true
+            added_pull_requests.push dict
             next
           end
           if @options[:enhancement_labels].include? label.name
             enhancement_a.push dict
-            added = true
+            added_pull_requests.push dict
             next
           end
         end
-        pull_requests.delete(dict) if added
       end
+      added_pull_requests.each { |p| pull_requests.delete(p) }
 
       [bugs_a, enhancement_a, issues_a]
     end

lib/github_changelog_generator/parser.rb

@@ -22,15 +22,20 @@ module GitHubChangelogGenerator
         exit
       end
 
+      print_options(options)
+
+      options
+    end
+
+    # @param [Hash] options to display
+    def self.print_options(options)
       if options[:verbose]
         Helper.log.info "Performing task with options:"
-        options_to_display = options
+        options_to_display = options.clone
         options_to_display[:token] = options_to_display[:token].nil? ? nil : "hidden value"
         pp options_to_display
         puts ""
       end
-
-      options
     end
 
     # setup parsing options

lib/github_changelog_generator/task.rb

@@ -51,7 +51,7 @@ module GitHubChangelogGenerator
 
         OPTIONS.each do |o|
           v = instance_variable_get("@#{o}")
-          options[o.to_sym] = v if v
+          options[o.to_sym] = v unless v.nil?
         end
 
         generator = Generator.new options

lib/github_changelog_generator/version.rb

@@ -1,3 +1,3 @@
 module GitHubChangelogGenerator
-  VERSION = "1.8.2"
+  VERSION = "1.8.5"
 end