mirror of
https://mau.dev/maunium/synapse.git
synced 2024-08-22 10:15:33 +00:00
Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into develop
This commit is contained in:
commit
e419c44ba4
1
changelog.d/6286.bugfix
Normal file
1
changelog.d/6286.bugfix
Normal file
@ -0,0 +1 @@
|
|||||||
|
Fix bug where room directory search was case sensitive.
|
@ -201,13 +201,17 @@ class RoomWorkerStore(SQLBaseStore):
|
|||||||
where_clauses.append(
|
where_clauses.append(
|
||||||
"""
|
"""
|
||||||
(
|
(
|
||||||
name LIKE ?
|
LOWER(name) LIKE ?
|
||||||
OR topic LIKE ?
|
OR LOWER(topic) LIKE ?
|
||||||
OR canonical_alias LIKE ?
|
OR LOWER(canonical_alias) LIKE ?
|
||||||
)
|
)
|
||||||
"""
|
"""
|
||||||
)
|
)
|
||||||
query_args += [search_term, search_term, search_term]
|
query_args += [
|
||||||
|
search_term.lower(),
|
||||||
|
search_term.lower(),
|
||||||
|
search_term.lower(),
|
||||||
|
]
|
||||||
|
|
||||||
where_clause = ""
|
where_clause = ""
|
||||||
if where_clauses:
|
if where_clauses:
|
||||||
|
2
tox.ini
2
tox.ini
@ -114,7 +114,7 @@ skip_install = True
|
|||||||
basepython = python3.6
|
basepython = python3.6
|
||||||
deps =
|
deps =
|
||||||
flake8
|
flake8
|
||||||
black
|
black==19.3b0 # We pin so that our tests don't start failing on new releases of black.
|
||||||
commands =
|
commands =
|
||||||
python -m black --check --diff .
|
python -m black --check --diff .
|
||||||
/bin/sh -c "flake8 synapse tests scripts scripts-dev scripts/hash_password scripts/register_new_matrix_user scripts/synapse_port_db synctl {env:PEP8SUFFIX:}"
|
/bin/sh -c "flake8 synapse tests scripts scripts-dev scripts/hash_password scripts/register_new_matrix_user scripts/synapse_port_db synctl {env:PEP8SUFFIX:}"
|
||||||
|
Loading…
Reference in New Issue
Block a user