Skip to content
This repository
Browse code

conform to app generated by version 1.4.11 of rails_apps_composer

  • Loading branch information...
commit 60e2ce425c649aedba4e578102725b00696939e3 1 parent 66438fe
Daniel Kehoe DanielKehoe authored

Showing 3 changed files with 6 additions and 6 deletions. Show diff stats Hide diff stats

  1. +1 1  Gemfile
  2. +4 4 Gemfile.lock
  3. +1 1  app/models/user.rb
2  Gemfile
@@ -8,7 +8,7 @@ group :assets do
8 8 end
9 9 gem 'jquery-rails'
10 10 gem "rspec-rails", ">= 2.10.1", :group => [:development, :test]
11   -gem "factory_girl_rails", ">= 3.2.0", :group => [:development, :test]
  11 +gem "factory_girl_rails", ">= 3.3.0", :group => [:development, :test]
12 12 gem "email_spec", ">= 1.2.1", :group => :test
13 13 gem "cucumber-rails", ">= 1.3.0", :group => :test, :require => false
14 14 gem "capybara", ">= 1.1.2", :group => :test
8 Gemfile.lock
@@ -70,10 +70,10 @@ GEM
70 70 erubis (2.7.0)
71 71 execjs (1.3.2)
72 72 multi_json (~> 1.0)
73   - factory_girl (3.2.0)
  73 + factory_girl (3.3.0)
74 74 activesupport (>= 3.0.0)
75   - factory_girl_rails (3.2.0)
76   - factory_girl (~> 3.2.0)
  75 + factory_girl_rails (3.3.0)
  76 + factory_girl (~> 3.3.0)
77 77 railties (>= 3.0.0)
78 78 ffi (1.0.11)
79 79 gherkin (2.10.0)
@@ -177,7 +177,7 @@ DEPENDENCIES
177 177 database_cleaner (>= 0.7.2)
178 178 devise (>= 2.1.0.rc2)
179 179 email_spec (>= 1.2.1)
180   - factory_girl_rails (>= 3.2.0)
  180 + factory_girl_rails (>= 3.3.0)
181 181 jquery-rails
182 182 launchy (>= 2.1.0)
183 183 rails (= 3.2.3)
2  app/models/user.rb
@@ -6,5 +6,5 @@ class User < ActiveRecord::Base
6 6 :recoverable, :rememberable, :trackable, :validatable
7 7
8 8 # Setup accessible (or protected) attributes for your model
9   - attr_accessible :name, :email, :password, :password_confirmation, :remember_me
  9 + attr_accessible :name, :email, :password, :password_confirmation, :remember_me
10 10 end

0 comments on commit 60e2ce4

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