aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-07-16 16:44:02 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-07-16 16:44:02 -0300
commit5284bbbe1e4c46d226202b71015d3ab8539751f3 (patch)
tree057d963ca9dc593209636115418f5b64a953969d /activesupport/CHANGELOG.md
parent9bbb3ca3066fc5dbaeddad97d995dbe435d0a031 (diff)
parent41679b2b31f88de2bf176197d883bc95dcb0a2f2 (diff)
downloadrails-5284bbbe1e4c46d226202b71015d3ab8539751f3.tar.gz
rails-5284bbbe1e4c46d226202b71015d3ab8539751f3.tar.bz2
rails-5284bbbe1e4c46d226202b71015d3ab8539751f3.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'activesupport/CHANGELOG.md')
-rw-r--r--activesupport/CHANGELOG.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 214722a0e5..f6d152174f 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Add `String#truncate_words` to truncate a string by a number of words.
+
+ *Mohamed Osama*
+
* Deprecate `capture` and `quietly`.
These methods are not thread safe and may cause issues when used in threaded environments.