Skip to content

Commit

Permalink
Merge pull request #296 from juno/cleanup-initializer
Browse files Browse the repository at this point in the history
remove duplicate code blocks for `user.reset_password_email_method_name`
  • Loading branch information
NoamB committed Jun 4, 2012
2 parents 02e94e7 + ae2c034 commit a1b365b
Showing 1 changed file with 5 additions and 13 deletions.
18 changes: 5 additions & 13 deletions lib/generators/sorcery/templates/initializer.rb
Expand Up @@ -218,14 +218,14 @@
# Default: `nil`
#
# user.user_activation_mailer =


# when true sorcery will not automatically
# email activation details and allow you to
# manually handle how and when email is sent.
# Default: `false`
#
# user.activation_mailer_disabled =
# user.activation_mailer_disabled =


# activation needed email method on your mailer class.
Expand Down Expand Up @@ -282,17 +282,9 @@
# manually handle how and when email is sent
# Default: `false`
#
# user.reset_password_mailer_disabled =
# user.reset_password_mailer_disabled =


# reset password email
# method on your mailer
# class.
# Default: `:reset_password_email`
#
# user.reset_password_email_method_name =


# how many seconds before the reset request expires. nil for never expires.
# Default: `nil`
#
Expand Down Expand Up @@ -347,7 +339,7 @@

# Unlock token mailer class
# Default: `nil`
#
#
# user.unlock_token_mailer = UserMailer

# -- activity logging --
Expand Down

0 comments on commit a1b365b

Please sign in to comment.