Skip to content

Commit

Permalink
Merge pull request heartcombo#3769 from xymbol/fix_typos
Browse files Browse the repository at this point in the history
Fix typos
  • Loading branch information
georgeguimaraes committed Sep 30, 2015
2 parents 827d009 + 2380612 commit 9f37b6e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion lib/devise/models/database_authenticatable.rb
Expand Up @@ -12,7 +12,7 @@ module Models
#
# == Options
#
# DatabaseAuthenticable adds the following options to devise_for:
# DatabaseAuthenticatable adds the following options to devise_for:
#
# * +pepper+: a random string used to provide a more secure hash. Use
# `rake secret` to generate new keys.
Expand Down
2 changes: 1 addition & 1 deletion lib/devise/strategies/authenticatable.rb
Expand Up @@ -27,7 +27,7 @@ def clean_up_csrf?

# Receives a resource and check if it is valid by calling valid_for_authentication?
# An optional block that will be triggered while validating can be optionally
# given as parameter. Check Devise::Models::Authenticable.valid_for_authentication?
# given as parameter. Check Devise::Models::Authenticatable.valid_for_authentication?
# for more information.
#
# In case the resource can't be validated, it will fail with the given
Expand Down
2 changes: 1 addition & 1 deletion test/models/lockable_test.rb
Expand Up @@ -14,7 +14,7 @@ def setup
end
end

test "should increment failed_attempts on successfull validation if the user is already locked" do
test "should increment failed_attempts on successful validation if the user is already locked" do
user = create_user
user.confirm

Expand Down

0 comments on commit 9f37b6e

Please sign in to comment.