aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--activerecord/CHANGELOG.md12
-rw-r--r--railties/CHANGELOG.md4
2 files changed, 8 insertions, 8 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index aa1e997ece..0497f6326e 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -4,13 +4,13 @@
* Added ActiveRecord::QueryMethods#rewhere which will overwrite an existing, named where condition.
- Examples:
-
- Post.where(trashed: true).where(trashed: false) #=> WHERE `trashed` = 1 AND `trashed` = 0
- Post.where(trashed: true).rewhere(trashed: false) #=> WHERE `trashed` = 0
- Post.where(active: true).where(trashed: true).rewhere(trashed: false) #=> WHERE `active` = 1 AND `trashed` = 0
+ Examples:
- *DHH*
+ Post.where(trashed: true).where(trashed: false) #=> WHERE `trashed` = 1 AND `trashed` = 0
+ Post.where(trashed: true).rewhere(trashed: false) #=> WHERE `trashed` = 0
+ Post.where(active: true).where(trashed: true).rewhere(trashed: false) #=> WHERE `active` = 1 AND `trashed` = 0
+
+ *DHH*
* Extend ActiveRecord::Base#cache_key to take an optional list of timestamp attributes of which the highest will be used.
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 0606a4fbe7..0dddee0555 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -3,9 +3,9 @@
Example:
- `BACKTRACE=1 ruby -Itest ...`
+ $ BACKTRACE=1 ruby -Itest ...
# or with rake
- `BAKCTRACE=1 bin/rake`
+ $ BACKTRACE=1 bin/rake
*Yves Senn*