diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2013-04-11 22:58:14 +0530 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2013-04-11 22:58:14 +0530 |
commit | b15ce4a006756a0b6cacfb9593d88c9a7dfd8eb0 (patch) | |
tree | 573c2401b48841a28209e93664af131146eea31e /actionpack/lib/action_view/helpers/tags/base.rb | |
parent | a24ef8611d19bce9c98aa21ee59d9dd0a08ecec5 (diff) | |
parent | 8a347d925d08a4fe648c6fe7c5e8c948e186c9bb (diff) | |
download | rails-b15ce4a006756a0b6cacfb9593d88c9a7dfd8eb0.tar.gz rails-b15ce4a006756a0b6cacfb9593d88c9a7dfd8eb0.tar.bz2 rails-b15ce4a006756a0b6cacfb9593d88c9a7dfd8eb0.zip |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
guides/source/action_mailer_basics.md
Diffstat (limited to 'actionpack/lib/action_view/helpers/tags/base.rb')
-rw-r--r-- | actionpack/lib/action_view/helpers/tags/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/tags/base.rb b/actionpack/lib/action_view/helpers/tags/base.rb index 10dec66b4f..3fe3f4e9df 100644 --- a/actionpack/lib/action_view/helpers/tags/base.rb +++ b/actionpack/lib/action_view/helpers/tags/base.rb @@ -1,7 +1,7 @@ module ActionView module Helpers - module Tags - class Base #:nodoc: + module Tags # :nodoc: + class Base # :nodoc: include Helpers::ActiveModelInstanceTag, Helpers::TagHelper, Helpers::FormTagHelper include FormOptionsHelper |