aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view/helpers/tags/text_area.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafael.franca@plataformatec.com.br>2014-08-17 22:38:22 -0300
committerRafael Mendonça França <rafael.franca@plataformatec.com.br>2014-08-17 22:38:22 -0300
commitc78da4d5c472f7254ed609ef753d7b1719732802 (patch)
treef04630ac62d08a49744b90bdf20bf75dcb883838 /actionview/lib/action_view/helpers/tags/text_area.rb
parent4e4913462104df89f1bee08faeb4ba5aab8c9228 (diff)
parent7ee055076ec2c5b2e9c110f821c10fe06bf38a1c (diff)
downloadrails-c78da4d5c472f7254ed609ef753d7b1719732802.tar.gz
rails-c78da4d5c472f7254ed609ef753d7b1719732802.tar.bz2
rails-c78da4d5c472f7254ed609ef753d7b1719732802.zip
Merge branch 'master' into loofah
Conflicts: actionpack/CHANGELOG.md
Diffstat (limited to 'actionview/lib/action_view/helpers/tags/text_area.rb')
-rw-r--r--actionview/lib/action_view/helpers/tags/text_area.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/actionview/lib/action_view/helpers/tags/text_area.rb b/actionview/lib/action_view/helpers/tags/text_area.rb
index 9ee83ee7c2..69038c1498 100644
--- a/actionview/lib/action_view/helpers/tags/text_area.rb
+++ b/actionview/lib/action_view/helpers/tags/text_area.rb
@@ -1,7 +1,11 @@
+require 'action_view/helpers/tags/placeholderable'
+
module ActionView
module Helpers
module Tags # :nodoc:
class TextArea < Base # :nodoc:
+ include Placeholderable
+
def render
options = @options.stringify_keys
add_default_name_and_id(options)