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

Neilj/fix autojoin #4223

Merged
merged 3 commits into from Nov 28, 2018

Conversation

Projects
None yet
3 participants
@neilisfragile
Contributor

neilisfragile commented Nov 23, 2018

In the case where the server requires consent, then auto joining cannot happen until consent has been granted by the user - this PR calls the auto join code after consent has been granted and calls it immediately if consent is not required

@neilisfragile neilisfragile requested a review from matrix-org/synapse-core Nov 23, 2018

@codecov-io

This comment has been minimized.

codecov-io commented Nov 28, 2018

Codecov Report

Merging #4223 into develop will increase coverage by 0.03%.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #4223      +/-   ##
===========================================
+ Coverage    73.52%   73.55%   +0.03%     
===========================================
  Files          299      299              
  Lines        29798    29806       +8     
  Branches      4871     4872       +1     
===========================================
+ Hits         21908    21923      +15     
+ Misses        6465     6454      -11     
- Partials      1425     1429       +4
Impacted Files Coverage Δ
synapse/rest/consent/consent_resource.py 74.48% <100%> (+0.53%) ⬆️
synapse/rest/client/v2_alpha/register.py 60.22% <100%> (+0.14%) ⬆️
synapse/handlers/register.py 70.74% <100%> (+0.65%) ⬆️
synapse/handlers/search.py 81.25% <0%> (ø) ⬆️
synapse/handlers/federation.py 61.72% <0%> (ø) ⬆️
synapse/state/v1.py 92.24% <0%> (+1.55%) ⬆️
synapse/handlers/message.py 83.5% <0%> (+1.71%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8ca53fb...713a9d1. Read the comment docs.

@hawkowl hawkowl merged commit 7039ece into develop Nov 28, 2018

5 checks passed

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
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@hawkowl hawkowl deleted the neilj/fix_autojoin branch Nov 28, 2018

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