aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorSamuel E. Giddins <segiddins@segiddins.me>2015-06-25 08:14:54 -0700
committerSamuel E. Giddins <segiddins@segiddins.me>2015-06-25 08:14:54 -0700
commita96f7ccfe6ba070447b0f3a6a6d14593eb1f8121 (patch)
treed0199d15abffd1b1e00e2f58b5cea526a46ebe0b /CHANGELOG.md
parentf11efb087d648faa92eb79ccb07a592f13c028f0 (diff)
parentb5db5535355e37a9bc23b87acc602e0398b3ec3c (diff)
downloadbundler-a96f7ccfe6ba070447b0f3a6a6d14593eb1f8121.tar.gz
Merge tag 'v1.10.5'
Version 1.10.5 # Conflicts: # README.md
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md10
1 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0cb80bee..1bad9060 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,14 @@
-## 1.10.5 (Unreleased)
+## 1.10.5 (2015-06-24)
+
+Workarounds:
+
+ - don't add or update BUNDLED WITH during `install` with no changes (@segiddins)
Bugfixes:
- - fix sorting of mixed DependencyLists with RubyGems >= 2.23 (@tony-spataro-rs)
+ - fix sorting of mixed DependencyLists with RubyGems >= 2.23 (#3762, @tony-spataro-rs)
+ - speed up resolver for path and git gems (@segiddins)
+ - fix `install --force` to not reinstall Bundler (#3743, @karlo57)
## 1.10.4 (2015-06-16)