Skip to content
Browse files

Merge branch 'vijaydev-master' into 1.2-stable

Conflicts:
	README.textile
  • Loading branch information...
2 parents cd3b49c + e1e1b81 commit 6baeac95e94dd35283bd40d9627856f851e2570c @justinfrench committed Dec 13, 2010
Showing with 1 addition and 3 deletions.
  1. +1 −1 README.textile
  2. +0 −2 lib/generators/formtastic/install/install_generator.rb
View
2 README.textile
@@ -659,7 +659,7 @@ We currently support both Rails 2 and Rails 3, under Ruby 1.8.7-ish (and 1.9.2-i
$ rvm gemset use formtastic-rails2
$ gem install bundler
$ RAILS_2=true bundle install
- $ rake spec
+ $ RAILS_2=true rake spec
$ touch .rvmrc
$ echo "rvm gemset use formtastic-rails-3" > .rvmrc
$ cd ~/code/formtastic
View
2 lib/generators/formtastic/install/install_generator.rb
@@ -6,10 +6,8 @@ class InstallGenerator < Rails::Generators::Base
source_root File.expand_path('../../../templates', __FILE__)
def copy_files
- empty_directory 'config/initializers'
template 'formtastic.rb', 'config/initializers/formtastic.rb'
- empty_directory 'public/stylesheets'
template 'formtastic.css', 'public/stylesheets/formtastic.css'
template 'formtastic_changes.css', 'public/stylesheets/formtastic_changes.css'
end

0 comments on commit 6baeac9

Please sign in to comment.
Something went wrong with that request. Please try again.