summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorDavid Baker <dbkr@users.noreply.github.com>2016-08-17 16:15:45 +0100
committerGitHub <noreply@github.com>2016-08-17 16:15:45 +0100
commit0d7cef09430c9bd403783ce9385d0b0b798b03e4 (patch)
tree3fdbca51ca54b0fcaba0efde0793c3d7122d45d8 /synapse/storage
parentAdd None check to _iterate_over_text (diff)
parentEmpty commit to trigger re-test (diff)
downloadsynapse-0d7cef09430c9bd403783ce9385d0b0b798b03e4.tar.xz
Merge pull request #1011 from matrix-org/dbkr/contains_display_name_override
Move display name rule
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/schema/delta/34/push_display_name_rename.sql17
1 files changed, 17 insertions, 0 deletions
diff --git a/synapse/storage/schema/delta/34/push_display_name_rename.sql b/synapse/storage/schema/delta/34/push_display_name_rename.sql
new file mode 100644

index 0000000000..51d9f82393 --- /dev/null +++ b/synapse/storage/schema/delta/34/push_display_name_rename.sql
@@ -0,0 +1,17 @@ +/* Copyright 2016 OpenMarket Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +UPDATE push_rules SET rule_id = 'global/override/.m.rule.contains_display_name' WHERE rule_id = 'global/underride/.m.rule.contains_display_name'; +UPDATE push_rules_enable SET rule_id = 'global/override/.m.rule.contains_display_name' WHERE rule_id = 'global/underride/.m.rule.contains_display_name';