Password reset - make emails friendlier and fix blank page #149

Merged
merged 3 commits into from Mar 27, 2013
Commits on Mar 26, 2013
  1. fixes the blank form when resetting password

    Skud committed Mar 26, 2013
  2. Made the password reset email friendlier.

    Skud committed Mar 26, 2013
    Also did the same for the unlock instructions, while I was in there.
Commits on Mar 27, 2013
  1. @pozorvlak

    Fix broken test for unlock instructions

    pozorvlak committed Mar 27, 2013
    There were some extra assertions left over from Devise's use of mocks that no
    longer make sense.