Skip to content

Commit

Permalink
Merge pull request heartcombo#3854 from joshsoftware/reset_password_t…
Browse files Browse the repository at this point in the history
…oken_issue

Comparing times in UTC
  • Loading branch information
josevalim committed Dec 15, 2015
2 parents 76bbbb8 + 23933d2 commit 934dbd1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/devise/models/recoverable.rb
Expand Up @@ -83,7 +83,7 @@ def send_reset_password_instructions
# reset_password_period_valid? # will always return false
#
def reset_password_period_valid?
reset_password_sent_at && reset_password_sent_at.utc >= self.class.reset_password_within.ago
reset_password_sent_at && reset_password_sent_at.utc >= self.class.reset_password_within.ago.utc
end

protected
Expand Down

0 comments on commit 934dbd1

Please sign in to comment.