Merge branch 'hotfix/update-changelog' into develop
This commit is contained in:
		
						commit
						6fa2f2701e
					
				@ -5,8 +5,14 @@ before_install:
 | 
				
			|||||||
  - gem install bundler
 | 
					  - gem install bundler
 | 
				
			||||||
rvm:
 | 
					rvm:
 | 
				
			||||||
  - 2.1.0
 | 
					  - 2.1.0
 | 
				
			||||||
 | 
					script: bundle exec rake checks
 | 
				
			||||||
 | 
					matrix:
 | 
				
			||||||
 | 
					  include:
 | 
				
			||||||
 | 
					    # Test install on clean system
 | 
				
			||||||
 | 
					    - install: true
 | 
				
			||||||
      script:
 | 
					      script:
 | 
				
			||||||
- bundle exec rake checks
 | 
					        - gem build github_changelog_generator
 | 
				
			||||||
 | 
					        - gem install *.gem
 | 
				
			||||||
notifications:
 | 
					notifications:
 | 
				
			||||||
  email:
 | 
					  email:
 | 
				
			||||||
    recipients:
 | 
					    recipients:
 | 
				
			||||||
 | 
				
			|||||||
@ -1,5 +1,13 @@
 | 
				
			|||||||
# Change Log
 | 
					# Change Log
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.11.5](https://github.com/skywinder/github-changelog-generator/tree/1.11.5) (2016-03-01)
 | 
				
			||||||
 | 
					[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.11.4...1.11.5)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					**Merged pull requests:**
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- Test clean install in Travis [\#344](https://github.com/skywinder/github-changelog-generator/pull/344) ([jkeiser](https://github.com/jkeiser))
 | 
				
			||||||
 | 
					- Update Rakefile to avoid install-breaking bug [\#341](https://github.com/skywinder/github-changelog-generator/pull/341) ([olleolleolle](https://github.com/olleolleolle))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
## [1.11.4](https://github.com/skywinder/github-changelog-generator/tree/1.11.4) (2016-02-26)
 | 
					## [1.11.4](https://github.com/skywinder/github-changelog-generator/tree/1.11.4) (2016-02-26)
 | 
				
			||||||
[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.11.3...1.11.4)
 | 
					[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.11.3...1.11.4)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -1,7 +1,7 @@
 | 
				
			|||||||
PATH
 | 
					PATH
 | 
				
			||||||
  remote: .
 | 
					  remote: .
 | 
				
			||||||
  specs:
 | 
					  specs:
 | 
				
			||||||
    github_changelog_generator (1.11.4)
 | 
					    github_changelog_generator (1.11.5)
 | 
				
			||||||
      bundler (>= 1.7)
 | 
					      bundler (>= 1.7)
 | 
				
			||||||
      colorize (~> 0.7)
 | 
					      colorize (~> 0.7)
 | 
				
			||||||
      github_api (~> 0.12)
 | 
					      github_api (~> 0.12)
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										4
									
								
								Rakefile
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								Rakefile
									
									
									
									
									
								
							@ -16,14 +16,14 @@ task :copy_man_page_to_manpath do |_t|
 | 
				
			|||||||
    path.file? && path.readable?
 | 
					    path.file? && path.readable?
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  return unless manpath
 | 
					  next unless manpath
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  writable_man_path = Pathname(manpath).each_line.find do |line|
 | 
					  writable_man_path = Pathname(manpath).each_line.find do |line|
 | 
				
			||||||
    path = Pathname(line.chomp)
 | 
					    path = Pathname(line.chomp)
 | 
				
			||||||
    path.directory? && path.writable?
 | 
					    path.directory? && path.writable?
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  return unless writable_man_path
 | 
					  next unless writable_man_path
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  man_prefix = Pathname("#{writable_man_path.chomp}/man1")
 | 
					  man_prefix = Pathname("#{writable_man_path.chomp}/man1")
 | 
				
			||||||
  man_pages = "man/git-*.1"
 | 
					  man_pages = "man/git-*.1"
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user