Merge branch 'master' into master

.travis.yml

@@ -15,7 +15,7 @@ matrix:
       gemfile: spec/install-gem-in-bundler.gemfile
     - rvm: 2.3.4
     - rvm: 2.4.1
-    - rvm: jruby-9.1.10.0
+    - rvm: jruby-9.1.12.0
       jdk: oraclejdk8
       env:
         - JRUBY_OPTS=--debug

README.md

@@ -1,6 +1,7 @@
 [![Gem Version](https://badge.fury.io/rb/github_changelog_generator.svg)](http://badge.fury.io/rb/github_changelog_generator)
 [![Dependency Status](https://gemnasium.com/skywinder/github-changelog-generator.svg)](https://gemnasium.com/skywinder/github-changelog-generator)
 [![Build Status](https://travis-ci.org/skywinder/github-changelog-generator.svg?branch=master)](https://travis-ci.org/skywinder/github-changelog-generator)
+[![Build status](https://ci.appveyor.com/api/projects/status/xdfnfmdjfo0upm7m?svg=true)](https://ci.appveyor.com/project/olleolleolle/github-changelog-generator)
 [![Inline docs](http://inch-ci.org/github/skywinder/github-changelog-generator.svg)](http://inch-ci.org/github/skywinder/github-changelog-generator)
 [![Code Climate](https://codeclimate.com/github/skywinder/github-changelog-generator/badges/gpa.svg)](https://codeclimate.com/github/skywinder/github-changelog-generator)
 [![Test Coverage](https://codeclimate.com/github/skywinder/github-changelog-generator/badges/coverage.svg)](https://codeclimate.com/github/skywinder/github-changelog-generator)
@@ -28,16 +29,16 @@ GitHub Changelog Generator ![GitHub Logo](../master/images/logo.jpg)
 
 Since you don't have to fill your `CHANGELOG.md` manually now: just run the script, relax and take a cup of :coffee: before your next release! :tada:
 
->### *What’s the point of a change log?*
+### *What’s the point of a change log?*
 To make it easier for users and contributors to see precisely what notable changes have been made between each release (or version) of the project.
 ### *Why should I care?*
 Because software tools are for people. If you don’t care, why are you contributing to open source? Surely, there must be a kernel (ha!) of care somewhere in that lovely little brain of yours.
 
-> :arrow_right: *[http://keepachangelog.com](http://keepachangelog.com)*
+:arrow_right: *[http://keepachangelog.com](http://keepachangelog.com)*
 
 ## Installation
 
-	gem install github_changelog_generator
+    gem install github_changelog_generator
 
 See also Troubleshooting.
 
@@ -46,7 +47,7 @@ See also Troubleshooting.
 - Look at **[CHANGELOG.md](https://github.com/skywinder/Github-Changelog-Generator/blob/master/CHANGELOG.md)** for this project
 - [ActionSheetPicker-3.0/CHANGELOG.md](https://github.com/skywinder/ActionSheetPicker-3.0/blob/master/CHANGELOG.md)  was generated by command:
 
-		github_changelog_generator -u skywinder -p ActionSheetPicker-3.0
+      github_changelog_generator -u skywinder -p ActionSheetPicker-3.0
 
 - In general, it looks like this:
 
@@ -74,16 +75,16 @@ See also Troubleshooting.
 
 - If your **`git remote`** `origin` refers to your GitHub repo, just go to your project folder and run:
 
-		github_changelog_generator
+      github_changelog_generator
 
 -  Or, run this from anywhere:
-    - `github_changelog_generator -u github_username -p github_project`
+      `github_changelog_generator -u github_username -p github_project`
-    - `github_changelog_generator  github_username/github_project`
+      `github_changelog_generator  github_username/github_project`
 
 - If you are running it against a repository on a Github Enterprise install, you must specify *both* `--github-site` and `--github-api` command line options:
 
-        github_changelog_generator --github-site="https://github.yoursite.com" \
+      github_changelog_generator --github-site="https://github.yoursite.com" \
-                                   --github-api="https://github.yoursite.com/api/v3/"
+                                 --github-api="https://github.yoursite.com/api/v3/"
 
 This generates a changelog to the `CHANGELOG.md` file, with pretty markdown formatting.
 
@@ -116,7 +117,7 @@ Here's how:
 
 You can set an environment variable by running the following command at the prompt, or by adding it to your shell profile (e.g., `~/.bash_profile` or `~/.zshrc`):
 
-        export CHANGELOG_GITHUB_TOKEN="«your-40-digit-github-token»"
+    export CHANGELOG_GITHUB_TOKEN="«your-40-digit-github-token»"
 
 So, if you get a message like this:
 

appveyor.yml

@@ -17,6 +17,9 @@ environment:
     - ruby_version: "21" # Older version, but matches Travis-CI
     - ruby_version: "21-x64"
 
+init:
+  - git config --global core.autocrlf true
+
 install:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
 
@@ -48,3 +51,8 @@ notifications:
       - sky4winder+githubchangeloggenerator@gmail.com
     on_build_success: false
     on_build_status_changed: true
+  - provider: GitHubPullRequest
+    on_build_success: true
+    on_build_failure: true
+    on_build_status_changed: true
+

lib/github_changelog_generator/generator/generator_generation.rb

@@ -24,7 +24,7 @@ module GitHubChangelogGenerator
       credit_line = "\n\n\\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*"
       log.gsub!(credit_line, "") # Remove old credit lines
       log += credit_line
-
+    
       @log = log
     end