diff options
| author | The Bundler Bot <bot@bundler.io> | 2017-10-06 11:17:18 +0000 |
|---|---|---|
| committer | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2017-12-11 20:42:18 +0900 |
| commit | b0c39afd81b47113ed97cc03fde4c2455650ac09 (patch) | |
| tree | a0358a18a01df8f0a446dffc4546916fbf99f512 | |
| parent | 7b9d2b08fd176918b8b6b224db225994dc0c5611 (diff) | |
| download | bundler-b0c39afd81b47113ed97cc03fde4c2455650ac09.tar.gz | |
Auto merge of #6078 - hsbt:rename-travis-template, r=olleolleolle
Rename .travis.yml.tt to travis.yml.tt.
### What was the end-user problem that led to this PR?
An installer of ruby core ignored dotfiles. and it is an inconsistency with gitignore file.
So bundled bundler fails `bundle gem` commands caused by this file.
This commit was r60122 from ruby/ruby: https://github.com/ruby/ruby/commit/5b3d137b1fd9f9f56fa6f17888ab8038906ed760
https://github.com/ruby/ruby/pull/1710
| -rw-r--r-- | lib/bundler/cli/gem.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/templates/newgem/travis.yml.tt (renamed from lib/bundler/templates/newgem/.travis.yml.tt) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/cli/gem.rb b/lib/bundler/cli/gem.rb index a18d929791..885578e819 100644 --- a/lib/bundler/cli/gem.rb +++ b/lib/bundler/cli/gem.rb @@ -83,7 +83,7 @@ module Bundler config[:test] = test_framework config[:test_framework_version] = TEST_FRAMEWORK_VERSIONS[test_framework] - templates.merge!(".travis.yml.tt" => ".travis.yml") + templates.merge!("travis.yml.tt" => ".travis.yml") case test_framework when "rspec" diff --git a/lib/bundler/templates/newgem/.travis.yml.tt b/lib/bundler/templates/newgem/travis.yml.tt index fe0761cc23..fe0761cc23 100644 --- a/lib/bundler/templates/newgem/.travis.yml.tt +++ b/lib/bundler/templates/newgem/travis.yml.tt |