diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-07-01 13:39:04 -0700 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-07-01 13:39:04 -0700 |
| commit | 53394420287009ac18ddb2831c981ea93e9491d0 (patch) | |
| tree | 1ee7bb9dca7feba21d1faf8fb325003a3d4fa313 /actionview/lib | |
| parent | dc9ff7bb7cb8e33aa6ddc6c9960f3d6394ec6987 (diff) | |
| parent | 38aafc037705aab2f09ec924bf634d105002e016 (diff) | |
| download | rails-53394420287009ac18ddb2831c981ea93e9491d0.tar.gz rails-53394420287009ac18ddb2831c981ea93e9491d0.tar.bz2 rails-53394420287009ac18ddb2831c981ea93e9491d0.zip | |
Merge pull request #11227 from vipulnsward/form_builder
Remove `FormBuilder` deprecation warning about block argument and tests
Diffstat (limited to 'actionview/lib')
| -rw-r--r-- | actionview/lib/action_view/helpers/form_helper.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/actionview/lib/action_view/helpers/form_helper.rb b/actionview/lib/action_view/helpers/form_helper.rb index f64c0ca30b..8a4830d887 100644 --- a/actionview/lib/action_view/helpers/form_helper.rb +++ b/actionview/lib/action_view/helpers/form_helper.rb @@ -1237,11 +1237,7 @@ module ActionView self end - def initialize(object_name, object, template, options, block=nil) - if block - ActiveSupport::Deprecation.warn "Giving a block to FormBuilder is deprecated and has no effect anymore." - end - + def initialize(object_name, object, template, options) @nested_child_index = {} @object_name, @object, @template, @options = object_name, object, template, options @default_options = @options ? @options.slice(:index, :namespace) : {} |