Sync with 1.0.0.rc2 - merge branch 'master' into rails3

lardawge · Aug 10, 2010 · 3dbe0fd · 3dbe0fd
2 parents 2f381ba + b9fc1c4
commit 3dbe0fd
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -10,6 +10,15 @@
 * Added compatible install and form helpers (rails3)
 * Added support for ActiveModel Validations, thanks to Guillaume Belleguic (rails3)
 
+1.0.0.rc2
+
+* Fixed that :label=>false didn't disable the label on checkboxes/radiobuttons (#331)
+* Added full support of :input_html options for hidden fields
+
+1.0.0.rc
+
+* Fixed that :checked_value and :unchecked_value options were being passed down into the HTML tags as attributes 
+
 1.0.0.beta4
 
 * ensure i18n < 0.4 is listed as a dependency in the gemspec

diff --git a/VERSION.yml b/VERSION.yml
@@ -2,4 +2,4 @@
 :major: 1
 :minor: 0
 :patch: 0
-:build: rc
+:build: rc2
diff --git a/formtastic.gemspec b/formtastic.gemspec
@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
-  s.version = "1.0.0.rc"
+  s.version = "1.0.0.rc2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin French"]
-  s.date = %q{2010-08-06}
+  s.date = %q{2010-08-09}
   s.description = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.email = %q{[email protected]}
   s.extra_rdoc_files = [
@@ -150,6 +150,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<i18n>, [">= 0.4.0"])
       s.add_dependency(%q<rspec-rails>, [">= 1.2.6"])
       s.add_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<i18n>, [">= 0.4.0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3.0"])

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
@@ -1411,7 +1411,6 @@ def legend_tag(method, options = {})
           )
       end
 
-
       # For methods that have a database column, take a best guess as to what the input method
       # should be.  In most cases, it will just return the column type (eg :string), but for special
       # cases it will simplify (like the case of :integer, :float & :decimal to :numeric), or do
-Original file line number
+Diff line change
@@ Expand Up / @@ -1411,7 +1411,6 @@ def legend_tag(method, options = {}) @@
               )
           end
           # For methods that have a database column, take a best guess as to what the input method
           # should be.  In most cases, it will just return the column type (eg :string), but for special
           # cases it will simplify (like the case of :integer, :float & :decimal to :numeric), or do
@@ Expand Down @@