Upgrade devise to 4.2 #6959
Merged
Upgrade devise to 4.2 #6959
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Going over the list I came to the same conclusion. |
cmrd-senya
force-pushed
the
devise-upgrade
branch
2 times, most recently
from
2316da9
to
afa8298
Compare
cmrd-senya
force-pushed
the
devise-upgrade
branch
from
afa8298
to
4ae26e1
Compare
|
Ok, I updated the locale. The PR is ready. |
|
Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
requests_helper.rbNote also, that devise 4.2 consideres "name@host" to be correct email, while previously it was different. Tests were corrected accordinlgy.
I'm setting this to [WIP] because the PR lacks translation updates for devise -- I wasn't sure what to do with it.
Here is the list of conflicting keys between ours and upstream version of locale file. The format of the file is:
Mostly it seems to me, that we should pick the upstream versions. I would probably leave
registartion.destroyedandregistration.signed_upin our versions, since it feel more relevant for diaspora. IMO, everything else can be updated. Opinions?