aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-12-30 19:36:06 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-12-30 19:36:06 -0800
commit969a0778cd2fd809a7b4f60c8477bb6d0ac9faf3 (patch)
tree6d71bcbc0c3031cc2aa2336024e873b931f1eec1 /activerecord/CHANGELOG.md
parent16e93561e2695afb6e0f264905e35ffd9381123d (diff)
parent5b96027ef6ac6e507ec9caf9973069345ce6a7cd (diff)
downloadrails-969a0778cd2fd809a7b4f60c8477bb6d0ac9faf3.tar.gz
rails-969a0778cd2fd809a7b4f60c8477bb6d0ac9faf3.tar.bz2
rails-969a0778cd2fd809a7b4f60c8477bb6d0ac9faf3.zip
Merge pull request #13541 from schneems/schneems/db-url-sub-key
Allow "url" sub key in database.yml configuration
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 46daf4978d..66bb018be9 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,9 @@
+* Connection specification now accepts a "url" key. The value of this
+ key is expected to contain a database URL. The database URL will be
+ expanded into a hash and merged.
+
+ *Richard Schneeman*
+
* An `ArgumentError` is now raised on a call to `Relation#where.not(nil)`.
Example: