diff options
| author | Samuel Giddins <segiddins@segiddins.me> | 2016-12-25 09:12:20 -0600 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2016-12-25 09:12:20 -0600 |
| commit | 8b5bf94f2f7666d4547b7fbe4719f2e840df4914 (patch) | |
| tree | 22e75fc5c6ab5bd061fd4f681d47fd9b24051be3 | |
| parent | 44dc252655d89f8ac601a4758f0571a3629bbfe0 (diff) | |
| parent | 018f9b81948a99bead40a0f91d8384b9dd4a80f2 (diff) | |
| download | bundler-8b5bf94f2f7666d4547b7fbe4719f2e840df4914.tar.gz | |
Merge tag 'v1.13.7'
Version 1.13.7
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | lib/bundler/dependency.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/version.rb | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ecfa8056f5..29771accae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 1.13.7 (2016-12-25) + +Features: + + - add support for the `ruby_24` gemfile filter (#5281, @amatsuda) + ## 1.13.6 (2016-10-22) Bugfixes: diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb index 133c722228..7b4ae44ef8 100644 --- a/lib/bundler/dependency.rb +++ b/lib/bundler/dependency.rb @@ -58,7 +58,7 @@ module Bundler :x64_mingw_21 => Gem::Platform::X64_MINGW, :x64_mingw_22 => Gem::Platform::X64_MINGW, :x64_mingw_23 => Gem::Platform::X64_MINGW, - :x64_mingw_24 => Gem::Platform::X64_MINGW + :x64_mingw_24 => Gem::Platform::X64_MINGW, }.freeze REVERSE_PLATFORM_MAP = {}.tap do |reverse_platform_map| diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index 9cd9fb0064..1f1a2ee09b 100644 --- a/lib/bundler/version.rb +++ b/lib/bundler/version.rb @@ -7,5 +7,5 @@ module Bundler # We're doing this because we might write tests that deal # with other versions of bundler and we are unsure how to # handle this better. - VERSION = "1.13.6" unless defined?(::Bundler::VERSION) + VERSION = "1.13.7" unless defined?(::Bundler::VERSION) end |