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

[pull] develop from matrix-org:develop #5

Open
wants to merge 10,000 commits into
base: experimental2
Choose a base branch
from

Conversation

pull[bot]
Copy link

@pull pull bot commented Jan 26, 2022

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

@atomist atomist bot added auto-branch-delete:on-close Delete branch when pull request gets closed auto-merge-method:merge Auto-merge with merge commit auto-merge:on-bpr-success Auto-merge on passed branch protection rule labels Jan 26, 2022
@pull pull bot added ⤵️ pull merge-conflict Resolve conflicts manually and removed auto-branch-delete:on-close Delete branch when pull request gets closed auto-merge:on-bpr-success Auto-merge on passed branch protection rule auto-merge-method:merge Auto-merge with merge commit labels Jan 26, 2022
@mergify
Copy link

mergify bot commented Feb 13, 2023

⚠️ The sha of the head commit of this PR conflicts with #6. Mergify cannot evaluate rules on this PR. ⚠️

19 similar comments
@mergify
Copy link

mergify bot commented Feb 13, 2023

⚠️ The sha of the head commit of this PR conflicts with #6. Mergify cannot evaluate rules on this PR. ⚠️

@mergify
Copy link

mergify bot commented Feb 13, 2023

⚠️ The sha of the head commit of this PR conflicts with #6. Mergify cannot evaluate rules on this PR. ⚠️

@mergify
Copy link

mergify bot commented Feb 13, 2023

⚠️ The sha of the head commit of this PR conflicts with #6. Mergify cannot evaluate rules on this PR. ⚠️

@mergify
Copy link

mergify bot commented Feb 13, 2023

⚠️ The sha of the head commit of this PR conflicts with #6. Mergify cannot evaluate rules on this PR. ⚠️

@mergify
Copy link

mergify bot commented Feb 13, 2023

⚠️ The sha of the head commit of this PR conflicts with #6. Mergify cannot evaluate rules on this PR. ⚠️

@mergify
Copy link

mergify bot commented Feb 14, 2023

⚠️ The sha of the head commit of this PR conflicts with #6. Mergify cannot evaluate rules on this PR. ⚠️

@mergify
Copy link

mergify bot commented Feb 14, 2023

⚠️ The sha of the head commit of this PR conflicts with #6. Mergify cannot evaluate rules on this PR. ⚠️

@mergify
Copy link

mergify bot commented Feb 14, 2023

⚠️ The sha of the head commit of this PR conflicts with #6. Mergify cannot evaluate rules on this PR. ⚠️

@mergify
Copy link

mergify bot commented Feb 14, 2023

⚠️ The sha of the head commit of this PR conflicts with #6. Mergify cannot evaluate rules on this PR. ⚠️

@mergify
Copy link

mergify bot commented Feb 14, 2023

⚠️ The sha of the head commit of this PR conflicts with #6. Mergify cannot evaluate rules on this PR. ⚠️

@mergify
Copy link

mergify bot commented Feb 14, 2023

⚠️ The sha of the head commit of this PR conflicts with #6. Mergify cannot evaluate rules on this PR. ⚠️

@mergify
Copy link

mergify bot commented Feb 14, 2023

⚠️ The sha of the head commit of this PR conflicts with #6. Mergify cannot evaluate rules on this PR. ⚠️

@mergify
Copy link

mergify bot commented Feb 14, 2023

⚠️ The sha of the head commit of this PR conflicts with #6. Mergify cannot evaluate rules on this PR. ⚠️

@mergify
Copy link

mergify bot commented Feb 14, 2023

⚠️ The sha of the head commit of this PR conflicts with #6. Mergify cannot evaluate rules on this PR. ⚠️

@mergify
Copy link

mergify bot commented Feb 14, 2023

⚠️ The sha of the head commit of this PR conflicts with #6. Mergify cannot evaluate rules on this PR. ⚠️

@mergify
Copy link

mergify bot commented Feb 15, 2023

⚠️ The sha of the head commit of this PR conflicts with #6. Mergify cannot evaluate rules on this PR. ⚠️

@mergify
Copy link

mergify bot commented Feb 15, 2023

⚠️ The sha of the head commit of this PR conflicts with #6. Mergify cannot evaluate rules on this PR. ⚠️

@mergify
Copy link

mergify bot commented Feb 15, 2023

⚠️ The sha of the head commit of this PR conflicts with #6. Mergify cannot evaluate rules on this PR. ⚠️

@mergify
Copy link

mergify bot commented Feb 15, 2023

⚠️ The sha of the head commit of this PR conflicts with #6. Mergify cannot evaluate rules on this PR. ⚠️

amandahla and others added 30 commits December 5, 2023 11:42
This reverts two commits:

    0bb8e41
    "Fix postgres schema after dropping old tables (#16730)"

and

    51e4e35
    "Add a Postgres `REPLICA IDENTITY` to tables that do not have an implicit one. This should allow use of Postgres logical replication. (take  2, now with no added deadlocks!) (#16658)"

and also amends the changelog.
Bumps [immutabledict](https://github.com/corenting/immutabledict) from 3.0.0 to 4.0.0.
- [Release notes](https://github.com/corenting/immutabledict/releases)
- [Changelog](https://github.com/corenting/immutabledict/blob/master/CHANGELOG.md)
- [Commits](corenting/immutabledict@v3.0.0...v4.0.0)

---
updated-dependencies:
- dependency-name: immutabledict
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [pydantic](https://github.com/pydantic/pydantic) from 2.5.1 to 2.5.2.
- [Release notes](https://github.com/pydantic/pydantic/releases)
- [Changelog](https://github.com/pydantic/pydantic/blob/v2.5.2/HISTORY.md)
- [Commits](pydantic/pydantic@v2.5.1...v2.5.2)

---
updated-dependencies:
- dependency-name: pydantic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](actions/setup-python@v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 4 to 5.
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](actions/setup-go@v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-go
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.1.6 to 0.1.7.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@v0.1.6...v0.1.7)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [isort](https://github.com/pycqa/isort) from 5.12.0 to 5.13.0.
- [Release notes](https://github.com/pycqa/isort/releases)
- [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md)
- [Commits](PyCQA/isort@5.12.0...5.13.0)

---
updated-dependencies:
- dependency-name: isort
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [types-setuptools](https://github.com/python/typeshed) from 68.2.0.2 to 69.0.0.0.
- [Commits](https://github.com/python/typeshed/commits)

---
updated-dependencies:
- dependency-name: types-setuptools
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [isort](https://github.com/pycqa/isort) from 5.13.0 to 5.13.1.
- [Release notes](https://github.com/pycqa/isort/releases)
- [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md)
- [Commits](PyCQA/isort@5.13.0...5.13.1)

---
updated-dependencies:
- dependency-name: isort
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
⤵️ pull merge-conflict Resolve conflicts manually
Projects
None yet
Development

Successfully merging this pull request may close these issues.