Permalink
Browse files

Merge branch 'master' into rails_4

Conflicts:
	lib/simple_form/action_view_extensions/builder.rb
	test/action_view_extensions/builder_test.rb
  • Loading branch information...
2 parents 1411718 + 5ce117c commit cae72bfca85ebe9f17683699a0ec7b6dd2ddf088 @rafaelfranca rafaelfranca committed Jan 2, 2013
View
@@ -9,10 +9,13 @@
## 2.1.0.dev
### enhancements
+ * `grouped_collection_select` now accepts proc/lambda as label and value method.
+ ([@svendahlstrand](https://github.com/svendahlstrand))
+ Closes [#623](https://github.com/plataformatec/simple_form/issues/623).
* Add Zurb Foundation 3 integration.
- ([@balexand](https://github/balexand))
+ ([@balexand](https://github.com/balexand))
* Generates additional wrapper class based on object + attribute name.
- ([@lucasmazza](https://github/lucasmazza))
+ ([@lucasmazza](https://github.com/lucasmazza))
Closes [#576](https://github.com/plataformatec/simple_form/issues/576).
* Allow `input_field` to work with `:defaults` options.
([@smidwap](https://github.com/smidwap))
View
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/rails/rails.git
- revision: 42d9b480121e15a15cddd2015a1e60a0f9e0f953
+ revision: 6a38befd51392ebfd6cd92adcde2690c1cf36b09
branch: master
specs:
actionpack (4.0.0.beta)
@@ -15,7 +15,7 @@ module Builder
# end
def simple_fields_for(*args, &block)
options = args.extract_options!
- options[:wrapper] ||= self.options[:wrapper]
+ options[:wrapper] = self.options[:wrapper] if options[:wrapper].nil?
options[:defaults] ||= self.options[:defaults]
if self.class < ActionView::Helpers::FormBuilder
Oops, something went wrong.

0 comments on commit cae72bf

Please sign in to comment.