summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorstrcmp <28xdb6+fvutuvy4f@grr.la>2015-12-27 05:42:13 +0000
committerstrcmp <28xdb6+fvutuvy4f@grr.la>2015-12-27 05:42:13 +0000
commit0213f8f0f97061acd10f3e874fa537fbd1537f0b (patch)
tree4557e224260625b2a4bd7b8d884694a3200596f9 /CHANGELOG.md
parent149d2827e8c5f51d13b233c052c2cecf19c3e7a6 (diff)
parent55f170ddb1801ac62cbeeefb004e1ed50816985b (diff)
downloadpry-0213f8f0f97061acd10f3e874fa537fbd1537f0b.tar.gz
Merge branch 'master' into pry-configure
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb81f7f7..068627bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
### HEAD
* Add `Pry.configure` as an alternative to the current way of changing configuration options in `.pryrc` files.
+* Add `Pry::Config::Behavior#eager_load!` to add a possible workaround for issues like [#1501](https://github.com/pry/pry/issues/1501)
* Remove Slop as a runtime dependency by vendoring v3.4 as Pry::Slop.
People can depend on Slop v4 and Pry at the same time without running into version conflicts. ([#1497](https://github.com/pry/pry/issues/1497))
* Fix auto-indentation of code that uses a single-line rescue ([#1450](https://github.com/pry/pry/issues/1450))