Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

conform to app generated by version 1.4.12 of rails_apps_composer

  • Loading branch information...
commit 83d6b06129dc7c30eaaf86d0add6e723f83e7239 1 parent c346004
@DanielKehoe DanielKehoe authored
View
6 Gemfile
@@ -8,13 +8,13 @@ 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
gem "database_cleaner", ">= 0.7.2", :group => :test
gem "launchy", ">= 2.1.0", :group => :test
-gem "devise", ">= 2.1.0.rc2"
+gem "devise", ">= 2.1.0"
gem "cancan", ">= 1.6.7"
gem "rolify", ">= 3.1.0"
-gem "bootstrap-sass", ">= 2.0.1"
+gem "bootstrap-sass", ">= 2.0.3"
View
18 Gemfile.lock
@@ -31,7 +31,7 @@ GEM
addressable (2.2.8)
arel (3.0.2)
bcrypt-ruby (3.0.1)
- bootstrap-sass (2.0.2)
+ bootstrap-sass (2.0.3)
builder (3.0.0)
cancan (1.6.7)
capybara (1.1.2)
@@ -49,7 +49,7 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.3.1)
+ coffee-script-source (1.3.3)
cucumber (1.2.0)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
@@ -60,7 +60,7 @@ GEM
cucumber (>= 1.1.8)
nokogiri (>= 1.5.0)
database_cleaner (0.7.2)
- devise (2.1.0.rc2)
+ devise (2.1.0)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.7)
railties (~> 3.1)
@@ -72,10 +72,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)
@@ -174,15 +174,15 @@ PLATFORMS
ruby
DEPENDENCIES
- bootstrap-sass (>= 2.0.1)
+ bootstrap-sass (>= 2.0.3)
cancan (>= 1.6.7)
capybara (>= 1.1.2)
coffee-rails (~> 3.2.1)
cucumber-rails (>= 1.3.0)
database_cleaner (>= 0.7.2)
- devise (>= 2.1.0.rc2)
+ devise (>= 2.1.0)
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
3  app/models/user.rb
@@ -7,5 +7,6 @@ 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
View
4 config/environments/development.rb
@@ -16,8 +16,8 @@
# ActionMailer Config
config.action_mailer.default_url_options = { :host => 'localhost:3000' }
config.action_mailer.delivery_method = :smtp
- # change to false to prevent email from being sent during development
- config.action_mailer.perform_deliveries = true
+ # change to true to allow email to be sent during development
+ config.action_mailer.perform_deliveries = false
config.action_mailer.raise_delivery_errors = true
config.action_mailer.default :charset => "utf-8"
View
4 config/locales/devise.en.yml
@@ -28,10 +28,10 @@ en:
send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
updated: 'Your password was changed successfully. You are now signed in.'
updated_not_active: 'Your password was changed successfully.'
- send_paranoid_instructions: "If your e-mail exists on our database, you will receive a password recovery link on your e-mail"
+ send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
confirmations:
send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
- send_paranoid_instructions: 'If your e-mail exists on our database, you will receive an email with instructions about how to confirm your account in a few minutes.'
+ send_paranoid_instructions: 'If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes.'
confirmed: 'Your account was successfully confirmed. You are now signed in.'
registrations:
signed_up: 'Welcome! You have signed up successfully.'
Please sign in to comment.
Something went wrong with that request. Please try again.