aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-12-20 18:29:49 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-12-20 18:29:49 -0300
commit4eefa1ef1d68d55bc518a78812b14aa24c41d036 (patch)
tree725bae4784b88c158f73fb898738a691db65f94e /activesupport
parent3aa327f9887d272e225c825bfbb1d698e37d1bee (diff)
parentf12d09f97fb54acb0a44eebbc049b4e30318634a (diff)
downloadrails-4eefa1ef1d68d55bc518a78812b14aa24c41d036.tar.gz
rails-4eefa1ef1d68d55bc518a78812b14aa24c41d036.tar.bz2
rails-4eefa1ef1d68d55bc518a78812b14aa24c41d036.zip
Merge pull request #8560 from u16suzu/master
Fix document for String#humanize Conflicts: activesupport/lib/active_support/core_ext/string/inflections.rb
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/core_ext/string/inflections.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/inflections.rb b/activesupport/lib/active_support/core_ext/string/inflections.rb
index 341e2deec9..6522145572 100644
--- a/activesupport/lib/active_support/core_ext/string/inflections.rb
+++ b/activesupport/lib/active_support/core_ext/string/inflections.rb
@@ -193,8 +193,8 @@ class String
# Capitalizes the first word, turns underscores into spaces, and strips '_id'.
# Like +titleize+, this is meant for creating pretty output.
#
- # 'employee_salary' # => "Employee salary"
- # 'author_id' # => "Author"
+ # 'employee_salary'.humanize # => "Employee salary"
+ # 'author_id'.humanize # => "Author"
def humanize
ActiveSupport::Inflector.humanize(self)
end