summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md10
1 files changed, 10 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8b3c74dd4..55a3b8a932 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 1.15.0.pre.3 (2017-04-30)
+
+Bugfixes:
+
+ - avoid redundant blank lines in the readme generated by `bundle gem` (@koic)
+ - ensure that `open-uri` is not loaded after `bundle exec` (@segiddins)
+ - print a helpful error message when an activated default gem conflicts with
+ a gem in the gemfile (@segiddins)
+ - only shorten `ref` option for git gems when it is a SHA (#5620, @segiddins)
+
## 1.15.0.pre.2 (2017-04-23)
Bugfixes: