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

Add some limitations to alias creation #5124

Merged
merged 1 commit into from May 2, 2019

Conversation

Projects
None yet
2 participants
@babolivier
Copy link
Member

commented May 2, 2019

No description provided.

@babolivier babolivier force-pushed the babolivier/aliases branch from 2d9fe9b to 917c029 May 2, 2019

@babolivier babolivier requested a review from matrix-org/synapse-core May 2, 2019

@babolivier babolivier force-pushed the babolivier/aliases branch 3 times, most recently from b3712c7 to 09986b6 May 2, 2019

@codecov

This comment has been minimized.

Copy link

commented May 2, 2019

Codecov Report

Merging #5124 into develop will decrease coverage by 0.06%.
The diff coverage is 60%.

@@             Coverage Diff             @@
##           develop    #5124      +/-   ##
===========================================
- Coverage    61.72%   61.65%   -0.07%     
===========================================
  Files          335      334       -1     
  Lines        34502    34533      +31     
  Branches      5669     5684      +15     
===========================================
- Hits         21295    21290       -5     
- Misses       11678    11711      +33     
- Partials      1529     1532       +3
@codecov

This comment has been minimized.

Copy link

commented May 2, 2019

Codecov Report

Merging #5124 into develop will decrease coverage by 38.26%.
The diff coverage is 0%.

@@             Coverage Diff              @@
##           develop    #5124       +/-   ##
============================================
- Coverage    61.65%   23.38%   -38.27%     
============================================
  Files          334      303       -31     
  Lines        34523    32916     -1607     
  Branches      5681     5134      -547     
============================================
- Hits         21284     7698    -13586     
- Misses       11709    25157    +13448     
+ Partials      1530       61     -1469

@babolivier babolivier force-pushed the babolivier/aliases branch from 09986b6 to 70034c9 May 2, 2019

Show resolved Hide resolved synapse/handlers/directory.py
Show resolved Hide resolved synapse/handlers/directory.py Outdated

@babolivier babolivier force-pushed the babolivier/aliases branch from 70034c9 to d965813 May 2, 2019

@babolivier babolivier requested a review from matrix-org/synapse-core May 2, 2019

@babolivier babolivier force-pushed the babolivier/aliases branch 3 times, most recently from f808515 to 4a95dc2 May 2, 2019

@babolivier babolivier referenced this pull request May 2, 2019

Merged

Support for synapse#5124 #606

@babolivier babolivier force-pushed the babolivier/aliases branch from 4a95dc2 to 7b3cbf6 May 2, 2019

@babolivier babolivier force-pushed the babolivier/aliases branch from 7b3cbf6 to 84196cb May 2, 2019

@richvdh

richvdh approved these changes May 2, 2019

Copy link
Member

left a comment

lgtm, assuming CI passes

@babolivier babolivier merged commit c193b39 into develop May 2, 2019

24 checks passed

buildkite/synapse Build #1215 passed (13 minutes, 31 seconds)
Details
buildkite/synapse/check-sample-config Passed (1 minute, 17 seconds)
Details
buildkite/synapse/isort Passed (18 seconds)
Details
buildkite/synapse/newspaper-newsfile Passed (15 seconds)
Details
buildkite/synapse/packaging Passed (16 seconds)
Details
buildkite/synapse/pep-8 Passed (57 seconds)
Details
buildkite/synapse/pipeline Passed (2 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-postgres-9-dot-4 Passed (11 minutes, 30 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-postgres-9-dot-5 Passed (11 minutes, 33 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-sqlite Passed (6 minutes, 40 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-sqlite-slash-old-deps Passed (7 minutes, 43 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-4 Passed (12 minutes, 13 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-5 Passed (12 minutes, 21 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite Passed (9 minutes, 30 seconds)
Details
buildkite/synapse/python-3-dot-6-slash-sqlite Passed (7 minutes, 2 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-11 Passed (12 minutes, 16 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-9-dot-5 Passed (12 minutes, 9 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-sqlite Passed (7 minutes, 55 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
codecov/patch 60% of diff hit (target 0%)
Details
codecov/project 61.65% (target 0%)
Details

babolivier added a commit that referenced this pull request May 8, 2019

Do checks on aliases for incoming m.room.aliases events (#5128)
Follow-up to #5124

Also added a bunch of checks to make sure everything (both the stuff added on #5124 and this PR) works as intended.
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.