Skip to content
Browse files

conform to app generated by version 1.4.11 of rails_apps_composer

  • Loading branch information...
1 parent 66438fe commit 60e2ce425c649aedba4e578102725b00696939e3 @DanielKehoe DanielKehoe committed May 13, 2012
Showing with 6 additions and 6 deletions.
  1. +1 −1 Gemfile
  2. +4 −4 Gemfile.lock
  3. +1 −1 app/models/user.rb
View
2 Gemfile
@@ -8,7 +8,7 @@ group :assets do
end
gem 'jquery-rails'
gem "rspec-rails", ">= 2.10.1", :group => [:development, :test]
-gem "factory_girl_rails", ">= 3.2.0", :group => [:development, :test]
+gem "factory_girl_rails", ">= 3.3.0", :group => [:development, :test]
gem "email_spec", ">= 1.2.1", :group => :test
gem "cucumber-rails", ">= 1.3.0", :group => :test, :require => false
gem "capybara", ">= 1.1.2", :group => :test
View
8 Gemfile.lock
@@ -70,10 +70,10 @@ GEM
erubis (2.7.0)
execjs (1.3.2)
multi_json (~> 1.0)
- factory_girl (3.2.0)
+ factory_girl (3.3.0)
activesupport (>= 3.0.0)
- factory_girl_rails (3.2.0)
- factory_girl (~> 3.2.0)
+ factory_girl_rails (3.3.0)
+ factory_girl (~> 3.3.0)
railties (>= 3.0.0)
ffi (1.0.11)
gherkin (2.10.0)
@@ -177,7 +177,7 @@ DEPENDENCIES
database_cleaner (>= 0.7.2)
devise (>= 2.1.0.rc2)
email_spec (>= 1.2.1)
- factory_girl_rails (>= 3.2.0)
+ factory_girl_rails (>= 3.3.0)
jquery-rails
launchy (>= 2.1.0)
rails (= 3.2.3)
View
2 app/models/user.rb
@@ -6,5 +6,5 @@ class User < ActiveRecord::Base
:recoverable, :rememberable, :trackable, :validatable
# Setup accessible (or protected) attributes for your model
- attr_accessible :name, :email, :password, :password_confirmation, :remember_me
+ attr_accessible :name, :email, :password, :password_confirmation, :remember_me
end

0 comments on commit 60e2ce4

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