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

Merged
merged 3 commits into from Mar 27, 2013

Conversation

Projects
None yet
3 participants
Owner

pozorvlak commented Mar 27, 2013

No description provided.

Skud and others added some commits Mar 26, 2013

Skud fixes the blank form when resetting password cc987b4
Skud Made the password reset email friendlier.
Also did the same for the unlock instructions, while I was in there.
dcd7df7
@pozorvlak pozorvlak Fix broken test for unlock instructions
There were some extra assertions left over from Devise's use of mocks that no
longer make sense.
5d09386

@pozorvlak pozorvlak added a commit that referenced this pull request Mar 27, 2013

@pozorvlak pozorvlak Merge pull request #149 from pozorvlak/password-reset
Password reset - make emails friendlier and fix blank page
37e406d

@pozorvlak pozorvlak merged commit 37e406d into Growstuff:dev Mar 27, 2013

pozorvlak deleted the pozorvlak:password-reset branch Mar 27, 2013

@phazel phazel commented on the diff Mar 27, 2013

config/locales/devise.en.yml
unlock_instructions:
- subject: 'Unlock Instructions'
+ subject: 'Unlock your Growstuff account'
@phazel

phazel Mar 27, 2013

Contributor

Shouldn't these 'Growstuff's be the config variable instead?

@Skud

Skud Mar 28, 2013

Contributor

In theory, yes, but in practice YAML's syntax is different and we weren't sure how to do it. We've forked off a bug report for it in PT, here: https://www.pivotaltracker.com/story/show/46876755

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment