diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-09-12 20:08:00 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-09-12 20:08:00 -0300 |
| commit | 4aa89eda065eb8d1ed16df72804c15a1a41719fa (patch) | |
| tree | 99d8071159e757b1713e4452c5639fdb4c6fcbeb /activerecord/CHANGELOG.md | |
| parent | b26224899734dd0193d85a542faf1e6f4a28ad14 (diff) | |
| parent | 87a84d3263c8712f85e70c45803203fa54658a9e (diff) | |
| download | rails-4aa89eda065eb8d1ed16df72804c15a1a41719fa.tar.gz rails-4aa89eda065eb8d1ed16df72804c15a1a41719fa.tar.bz2 rails-4aa89eda065eb8d1ed16df72804c15a1a41719fa.zip | |
Merge pull request #12156 from rywall/from-copy-binds
Allow Relation#from to accept other relations with bind values.
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/CHANGELOG.md')
| -rw-r--r-- | activerecord/CHANGELOG.md | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 691c684d76..05eb2f8750 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,7 @@ +* Allow Relation#from to accept other relations with bind values. + + *Ryan Wallace* + * Fix inserts with prepared statements disabled. Fixes #12023. |