diff options
| author | Andre Arko <andre@arko.net> | 2014-01-10 18:18:55 -0800 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2014-01-10 23:05:03 -0800 |
| commit | ec9165fdffe63f6d5a8b2a9a302252ec1116618c (patch) | |
| tree | 832691ee4d654f00b183893de5b9d6af8435d00e /bundler.gemspec | |
| parent | 27205e903455e38a79a765c0426f63e3ae8efd0e (diff) | |
| download | bundler-ec9165fdffe63f6d5a8b2a9a302252ec1116618c.tar.gz | |
Merge tag 'v1.5.2' into 'master'
Conflicts:
CHANGELOG.md
Rakefile
lib/bundler/installer.rb
lib/bundler/rubygems_ext.rb
lib/bundler/source/rubygems.rb
spec/realworld/parallel_install_spec.rb
spec/realworld/parallel_update_spec.rb
Diffstat (limited to 'bundler.gemspec')
| -rw-r--r-- | bundler.gemspec | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bundler.gemspec b/bundler.gemspec index 37c320e77e..17ed42f617 100644 --- a/bundler.gemspec +++ b/bundler.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'ronn', '~> 0.7.3' spec.add_development_dependency 'rspec', '~> 2.99.0.beta1' - spec.files = `git ls-files`.split($/) + spec.files = `git ls-files -z`.split("\x0") spec.files += Dir.glob('lib/bundler/man/**/*') # man/ is ignored by git spec.test_files = spec.files.grep(%r{^spec/}) |