Merge remote-tracking branch 'origin/develop' into erikj/better_push_…

…badge_perf
element-hq · Dec 21, 2023 · 72c02e1 · 72c02e1
2 parents 3946ea6 + 8a50312
commit 72c02e1
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 0 deletions.
diff --git a/changelog.d/16757.misc b/changelog.d/16757.misc
@@ -0,0 +1 @@
+Move the rust stubs inline for better IDE integration.
diff --git a/changelog.d/16758.misc b/changelog.d/16758.misc
@@ -0,0 +1 @@
+Fix sample config doc CI.
diff --git a/docs/.sample_config_header.yaml b/docs/.sample_config_header.yaml
@@ -9,3 +9,4 @@
 # https://element-hq.github.io/synapse/latest/setup/installation.html.
 #
 ################################################################################
+
diff --git a/stubs/synapse/__init__.pyi b/stubs/synapse/__init__.pyi
diff --git a/stubs/synapse/synapse_rust/__init__.pyi → synapse/synapse_rust/__init__.pyi b/stubs/synapse/synapse_rust/__init__.pyi → synapse/synapse_rust/__init__.pyi
diff --git a/stubs/synapse/synapse_rust/acl.pyi → synapse/synapse_rust/acl.pyi b/stubs/synapse/synapse_rust/acl.pyi → synapse/synapse_rust/acl.pyi
diff --git a/stubs/synapse/synapse_rust/push.pyi → synapse/synapse_rust/push.pyi b/stubs/synapse/synapse_rust/push.pyi → synapse/synapse_rust/push.pyi