Permalink
Browse files

Merge branch 'feature/upgrade-to-rails-2.3.8' into develop

  • Loading branch information...
2 parents 7cecba6 + 59e2b30 commit ac8987b792e471420b4e88f25bba5621b16556a5 @rick committed Jul 24, 2010
Showing 2,866 changed files with 524,487 additions and 103,471 deletions.
View
@@ -82,8 +82,8 @@ def gem_version
end
def load_rubygems
+ min_version = '1.3.2'
require 'rubygems'
- min_version = '1.3.1'
unless rubygems_version >= min_version
$stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
exit 1
View
@@ -1,7 +1,7 @@
# Be sure to restart your server when you modify this file
# Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
# Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot')
@@ -11,8 +11,7 @@
config.gem 'haml'
config.gem 'mocha'
config.gem 'less'
- config.gem 'mislav-will_paginate', :version => '~> 2.3.8', :lib => 'will_paginate',
- :source => 'http://gems.github.com'
+ config.gem 'formtastic'
# Settings in config/environments/* take precedence over those specified here.
# Application configuration should go into files in config/initializers
View
@@ -52,7 +52,7 @@
describe 'relationships' do
before :each do
- @host = Host.new
+ @host = Host.generate!
end
it 'should have many deployed services' do
@@ -0,0 +1,211 @@
+--- !ruby/object:Gem::Specification
+name: formtastic
+version: !ruby/object:Gem::Version
+ hash: 47
+ prerelease: false
+ segments:
+ - 0
+ - 9
+ - 10
+ version: 0.9.10
+platform: ruby
+authors:
+- Justin French
+autorequire:
+bindir: bin
+cert_chain: []
+
+date: 2010-05-25 00:00:00 -05:00
+default_executable:
+dependencies:
+- !ruby/object:Gem::Dependency
+ name: activesupport
+ prerelease: false
+ requirement: &id001 !ruby/object:Gem::Requirement
+ none: false
+ requirements:
+ - - ">="
+ - !ruby/object:Gem::Version
+ hash: 3
+ segments:
+ - 2
+ - 3
+ - 0
+ version: 2.3.0
+ type: :runtime
+ version_requirements: *id001
+- !ruby/object:Gem::Dependency
+ name: actionpack
+ prerelease: false
+ requirement: &id002 !ruby/object:Gem::Requirement
+ none: false
+ requirements:
+ - - ">="
+ - !ruby/object:Gem::Version
+ hash: 3
+ segments:
+ - 2
+ - 3
+ - 0
+ version: 2.3.0
+ type: :runtime
+ version_requirements: *id002
+- !ruby/object:Gem::Dependency
+ name: rspec-rails
+ prerelease: false
+ requirement: &id003 !ruby/object:Gem::Requirement
+ none: false
+ requirements:
+ - - ">="
+ - !ruby/object:Gem::Version
+ hash: 19
+ segments:
+ - 1
+ - 2
+ - 6
+ version: 1.2.6
+ type: :development
+ version_requirements: *id003
+- !ruby/object:Gem::Dependency
+ name: rspec_tag_matchers
+ prerelease: false
+ requirement: &id004 !ruby/object:Gem::Requirement
+ none: false
+ requirements:
+ - - ">="
+ - !ruby/object:Gem::Version
+ hash: 23
+ segments:
+ - 1
+ - 0
+ - 0
+ version: 1.0.0
+ type: :development
+ version_requirements: *id004
+description: A Rails form builder plugin/gem with semantically rich and accessible markup
+email: justin@indent.com.au
+executables: []
+
+extensions: []
+
+extra_rdoc_files:
+- README.textile
+files:
+- MIT-LICENSE
+- README.textile
+- Rakefile
+- generators/form/USAGE
+- generators/form/form_generator.rb
+- generators/form/templates/view__form.html.erb
+- generators/form/templates/view__form.html.haml
+- generators/formtastic/formtastic_generator.rb
+- generators/formtastic/templates/formtastic.css
+- generators/formtastic/templates/formtastic.rb
+- generators/formtastic/templates/formtastic_changes.css
+- generators/formtastic_stylesheets/formtastic_stylesheets_generator.rb
+- lib/formtastic.rb
+- lib/formtastic/i18n.rb
+- lib/formtastic/layout_helper.rb
+- lib/formtastic/util.rb
+- lib/locale/en.yml
+- rails/init.rb
+- spec/buttons_spec.rb
+- spec/commit_button_spec.rb
+- spec/custom_builder_spec.rb
+- spec/custom_macros.rb
+- spec/defaults_spec.rb
+- spec/error_proc_spec.rb
+- spec/errors_spec.rb
+- spec/form_helper_spec.rb
+- spec/i18n_spec.rb
+- spec/include_blank_spec.rb
+- spec/input_spec.rb
+- spec/inputs/boolean_input_spec.rb
+- spec/inputs/check_boxes_input_spec.rb
+- spec/inputs/country_input_spec.rb
+- spec/inputs/date_input_spec.rb
+- spec/inputs/datetime_input_spec.rb
+- spec/inputs/file_input_spec.rb
+- spec/inputs/hidden_input_spec.rb
+- spec/inputs/numeric_input_spec.rb
+- spec/inputs/password_input_spec.rb
+- spec/inputs/radio_input_spec.rb
+- spec/inputs/select_input_spec.rb
+- spec/inputs/string_input_spec.rb
+- spec/inputs/text_input_spec.rb
+- spec/inputs/time_input_spec.rb
+- spec/inputs/time_zone_input_spec.rb
+- spec/inputs_spec.rb
+- spec/label_spec.rb
+- spec/layout_helper_spec.rb
+- spec/semantic_errors_spec.rb
+- spec/semantic_fields_for_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+has_rdoc: true
+homepage: http://github.com/justinfrench/formtastic/tree/master
+licenses: []
+
+post_install_message: "\n ========================================================================\n Thanks for installing Formtastic!\n ------------------------------------------------------------------------\n You can now (optionally) run the generator to copy some stylesheets and\n a config initializer into your application:\n ./script/generate formtastic\n\n To generate some semantic form markup for your existing models, just run:\n ./script/generate form MODEL_NAME\n\n Find out more and get involved:\n http://github.com/justinfrench/formtastic\n http://groups.google.com.au/group/formtastic\n ========================================================================\n "
+rdoc_options:
+- --charset=UTF-8
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+ none: false
+ requirements:
+ - - ">="
+ - !ruby/object:Gem::Version
+ hash: 3
+ segments:
+ - 0
+ version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement
+ none: false
+ requirements:
+ - - ">="
+ - !ruby/object:Gem::Version
+ hash: 3
+ segments:
+ - 0
+ version: "0"
+requirements: []
+
+rubyforge_project:
+rubygems_version: 1.3.7
+signing_key:
+specification_version: 3
+summary: A Rails form builder plugin/gem with semantically rich and accessible markup
+test_files:
+- spec/buttons_spec.rb
+- spec/commit_button_spec.rb
+- spec/custom_builder_spec.rb
+- spec/custom_macros.rb
+- spec/defaults_spec.rb
+- spec/error_proc_spec.rb
+- spec/errors_spec.rb
+- spec/form_helper_spec.rb
+- spec/i18n_spec.rb
+- spec/include_blank_spec.rb
+- spec/input_spec.rb
+- spec/inputs/boolean_input_spec.rb
+- spec/inputs/check_boxes_input_spec.rb
+- spec/inputs/country_input_spec.rb
+- spec/inputs/date_input_spec.rb
+- spec/inputs/datetime_input_spec.rb
+- spec/inputs/file_input_spec.rb
+- spec/inputs/hidden_input_spec.rb
+- spec/inputs/numeric_input_spec.rb
+- spec/inputs/password_input_spec.rb
+- spec/inputs/radio_input_spec.rb
+- spec/inputs/select_input_spec.rb
+- spec/inputs/string_input_spec.rb
+- spec/inputs/text_input_spec.rb
+- spec/inputs/time_input_spec.rb
+- spec/inputs/time_zone_input_spec.rb
+- spec/inputs_spec.rb
+- spec/label_spec.rb
+- spec/layout_helper_spec.rb
+- spec/semantic_errors_spec.rb
+- spec/semantic_fields_for_spec.rb
+- spec/spec_helper.rb
Oops, something went wrong.

0 comments on commit ac8987b

Please sign in to comment.