Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change password reset links to /_matrix. #5424

Merged
merged 3 commits into from Jun 11, 2019

Conversation

Projects
None yet
2 participants
@erikjohnston
Copy link
Member

commented Jun 11, 2019

Also improve wording of password success page to clarify that the user has to go back to the client.

I also added some tests

@erikjohnston erikjohnston requested a review from matrix-org/synapse-core Jun 11, 2019

@erikjohnston erikjohnston force-pushed the erikj/change_password_reset_links branch from 4c0128e to 453aaaa Jun 11, 2019

@babolivier
Copy link
Member

left a comment

If I was really picky I'd say that to the extent of my knowledge "kangeroo" is written "kangaroo", otherwise lgtm

@erikjohnston

This comment has been minimized.

Copy link
Member Author

commented Jun 11, 2019

If I was really picky I'd say that to the extent of my knowledge "kangeroo" is written "kangaroo", otherwise lgtm

Its on purpose because then its a super secure password that no one would guess and that's my excuse and I'm sticking to it.

@codecov

This comment has been minimized.

Copy link

commented Jun 11, 2019

Codecov Report

Merging #5424 into release-v1.0.0 will decrease coverage by 0.05%.
The diff coverage is 100%.

@@                Coverage Diff                 @@
##           release-v1.0.0    #5424      +/-   ##
==================================================
- Coverage           62.61%   62.56%   -0.06%     
==================================================
  Files                 326      326              
  Lines               35668    35667       -1     
  Branches             5852     5852              
==================================================
- Hits                22334    22314      -20     
+ Misses              11782    11750      -32     
- Partials             1552     1603      +51
@codecov

This comment has been minimized.

Copy link

commented Jun 11, 2019

Codecov Report

Merging #5424 into release-v1.0.0 will decrease coverage by 0.06%.
The diff coverage is 100%.

@@                Coverage Diff                 @@
##           release-v1.0.0    #5424      +/-   ##
==================================================
- Coverage           62.61%   62.54%   -0.07%     
==================================================
  Files                 326      326              
  Lines               35668    35667       -1     
  Branches             5852     5852              
==================================================
- Hits                22334    22309      -25     
+ Misses              11782    11754      -28     
- Partials             1552     1604      +52

@erikjohnston erikjohnston force-pushed the erikj/change_password_reset_links branch from 8b3ee7e to a766c41 Jun 11, 2019

@babolivier
Copy link
Member

left a comment

lgtm

@erikjohnston erikjohnston merged commit 9532eb5 into release-v1.0.0 Jun 11, 2019

22 checks passed

buildkite/synapse Build #2055 passed (19 minutes, 33 seconds)
Details
buildkite/synapse/check-sample-config Passed (1 minute, 12 seconds)
Details
buildkite/synapse/isort Passed (15 seconds)
Details
buildkite/synapse/newspaper-newsfile Passed (12 seconds)
Details
buildkite/synapse/packaging Passed (16 seconds)
Details
buildkite/synapse/pep-8 Passed (53 seconds)
Details
buildkite/synapse/pipeline Passed (2 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-postgres-9-dot-4 Passed (15 minutes, 13 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-postgres-9-dot-5 Passed (17 minutes, 25 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-sqlite Passed (5 minutes, 30 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-sqlite-slash-old-deps Passed (6 minutes, 19 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-4 Passed (18 minutes, 8 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-5 Passed (17 minutes, 56 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite Passed (5 minutes, 41 seconds)
Details
buildkite/synapse/python-3-dot-6-slash-sqlite Passed (5 minutes, 44 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-11 Passed (15 minutes, 47 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-9-dot-5 Passed (15 minutes, 39 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-sqlite Passed (5 minutes, 32 seconds)
Details
ci/circleci: sytestpy2merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy2postgresmerged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3postgresmerged Your tests passed on CircleCI!
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.