conform to version generated by version 1.1.4 of rails_apps_composer

Author: DanielKehoe

.gitignore

@@ -1,5 +1,7 @@
 #----------------------------------------------------------------------------
-# Ignore these files when commiting to a git repository
+# Ignore these files when commiting to a git repository.
+#
+# See http://help.github.com/ignore-files/ for more about ignoring files.
 #
 # The original version of this file is found here:
 # https://github.com/RailsApps/rails3-application-templates/raw/master/files/gitignore.txt
@@ -14,8 +16,8 @@
 
 # minimal Rails specific artifacts
 db/*.sqlite3
-/log/*
-tmp/*
+/log/*.log
+/tmp
 
 # various artifacts
 **.war
@@ -48,6 +50,12 @@ tmp/*
 /spec/views
 /specifications
 
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile ~/.gitignore_global
+#
+# Here are some files you may want to ignore globally:
+
 # scm revert files
 **.orig
 

.rvmrc

@@ -0,0 +1 @@
+rvm ruby-1.9.3-p0@rails32

Gemfile

@@ -1,16 +1,19 @@
 source 'https://rubygems.org'
-gem 'rails', '3.2.0'
+gem 'rails', '3.2.1'
 gem 'sqlite3'
 group :assets do
   gem 'sass-rails',   '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'  
+  gem 'coffee-rails', '~> 3.2.1'
+  
+  
   gem 'uglifier', '>= 1.0.3'
 end
 gem 'jquery-rails'
 gem "rspec-rails", ">= 2.8.1", :group => [:development, :test]
-gem "factory_girl_rails", ">= 1.6.0", :group => :test
-gem "cucumber-rails", ">= 1.2.1", :group => :test
+gem "factory_girl_rails", ">= 1.7.0", :group => :test
+gem "email_spec", ">= 1.2.1", :group => :test
+gem "cucumber-rails", ">= 1.3.0", :group => :test
 gem "capybara", ">= 1.1.2", :group => :test
 gem "database_cleaner", ">= 0.7.1", :group => :test
 gem "launchy", ">= 2.0.5", :group => :test
-gem "devise", ">= 2.0.0"
+gem "devise", ">= 2.0.4"

Gemfile.lock

@@ -1,35 +1,35 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.0)
-      actionpack (= 3.2.0)
+    actionmailer (3.2.1)
+      actionpack (= 3.2.1)
       mail (~> 2.4.0)
-    actionpack (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
+    actionpack (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.0)
+      journey (~> 1.0.1)
       rack (~> 1.4.0)
       rack-cache (~> 1.1)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
-    activemodel (3.2.0)
-      activesupport (= 3.2.0)
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)
       builder (~> 3.0.0)
-    activerecord (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
+    activerecord (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
       arel (~> 3.0.0)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
-    activesupport (3.2.0)
+    activeresource (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+    activesupport (3.2.1)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.6)
-    arel (3.0.0)
+    addressable (2.2.7)
+    arel (3.0.2)
     bcrypt-ruby (3.0.1)
     builder (3.0.0)
     capybara (1.1.2)
@@ -48,49 +48,53 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.2.0)
-    cucumber (1.1.4)
+    cucumber (1.1.8)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.7.1)
+      gherkin (~> 2.8.0)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
-    cucumber-rails (1.2.1)
+    cucumber-rails (1.3.0)
       capybara (>= 1.1.2)
-      cucumber (>= 1.1.3)
+      cucumber (>= 1.1.8)
       nokogiri (>= 1.5.0)
     database_cleaner (0.7.1)
-    devise (2.0.0)
+    devise (2.0.4)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
       railties (~> 3.1)
-      warden (~> 1.1)
+      warden (~> 1.1.1)
     diff-lcs (1.1.3)
+    email_spec (1.2.1)
+      mail (~> 2.2)
+      rspec (~> 2.0)
     erubis (2.7.0)
     execjs (1.3.0)
       multi_json (~> 1.0)
-    factory_girl (2.5.1)
-      activesupport
-    factory_girl_rails (1.6.0)
-      factory_girl (~> 2.5.0)
+    factory_girl (2.6.0)
+      activesupport (>= 2.3.9)
+    factory_girl_rails (1.7.0)
+      factory_girl (~> 2.6.0)
       railties (>= 3.0.0)
     ffi (1.0.11)
-    gherkin (2.7.6)
+    gherkin (2.8.0)
       json (>= 1.4.6)
     hike (1.2.1)
     i18n (0.6.0)
-    journey (1.0.1)
+    journey (1.0.2)
     jquery-rails (2.0.0)
       railties (>= 3.2.0.beta, < 5.0)
       thor (~> 0.14)
     json (1.6.5)
+    json_pure (1.6.5)
     launchy (2.0.5)
       addressable (~> 2.2.6)
     mail (2.4.1)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
-    multi_json (1.0.4)
+    multi_json (1.1.0)
     nokogiri (1.5.0)
     orm_adapter (0.0.6)
     polyglot (0.3.3)
@@ -101,17 +105,17 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.0)
-      actionmailer (= 3.2.0)
-      actionpack (= 3.2.0)
-      activerecord (= 3.2.0)
-      activeresource (= 3.2.0)
-      activesupport (= 3.2.0)
+    rails (3.2.1)
+      actionmailer (= 3.2.1)
+      actionpack (= 3.2.1)
+      activerecord (= 3.2.1)
+      activeresource (= 3.2.1)
+      activesupport (= 3.2.1)
       bundler (~> 1.0)
-      railties (= 3.2.0)
-    railties (3.2.0)
-      actionpack (= 3.2.0)
-      activesupport (= 3.2.0)
+      railties (= 3.2.1)
+    railties (3.2.1)
+      actionpack (= 3.2.1)
+      activesupport (= 3.2.1)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -132,16 +136,16 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.8.0)
-    rubyzip (0.9.5)
-    sass (3.1.14)
+    rubyzip (0.9.6.1)
+    sass (3.1.15)
     sass-rails (3.2.4)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.18.0)
-      childprocess (>= 0.2.5)
+    selenium-webdriver (2.13.0)
+      childprocess (>= 0.2.1)
       ffi (~> 1.0.9)
-      multi_json (~> 1.0.4)
+      json_pure
       rubyzip
     sprockets (2.1.2)
       hike (~> 1.2)
@@ -158,7 +162,7 @@ GEM
     uglifier (1.2.3)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
-    warden (1.1.0)
+    warden (1.1.1)
       rack (>= 1.0)
     xpath (0.1.4)
       nokogiri (~> 1.3)
@@ -169,13 +173,14 @@ PLATFORMS
 DEPENDENCIES
   capybara (>= 1.1.2)
   coffee-rails (~> 3.2.1)
-  cucumber-rails (>= 1.2.1)
+  cucumber-rails (>= 1.3.0)
   database_cleaner (>= 0.7.1)
-  devise (>= 2.0.0)
-  factory_girl_rails (>= 1.6.0)
+  devise (>= 2.0.4)
+  email_spec (>= 1.2.1)
+  factory_girl_rails (>= 1.7.0)
   jquery-rails
   launchy (>= 2.0.5)
-  rails (= 3.2.0)
+  rails (= 3.2.1)
   rspec-rails (>= 2.8.1)
   sass-rails (~> 3.2.3)
   sqlite3

app/views/devise/registrations/edit.html.erb

@@ -9,7 +9,7 @@
   <%= f.email_field :email %></div>
 
   <div><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
-  <%= f.password_field :password %></div>
+  <%= f.password_field :password, :autocomplete => "off" %></div>
 
   <div><%= f.label :password_confirmation %><br />
   <%= f.password_field :password_confirmation %></div>