mirror of https://github.com/zulip/zulip.git
typos: Fix typos caught by typos.
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
parent
7b4a74cc4d
commit
4cb2eded68
|
@ -221,7 +221,7 @@ _Released 2023-08-25_
|
||||||
_Released 2023-07-05_
|
_Released 2023-07-05_
|
||||||
|
|
||||||
- Started logging a more accurate, detailed, and actionable error messages when
|
- Started logging a more accurate, detailed, and actionable error messages when
|
||||||
[common reverse proxy mis-configurations][proxies] are detected.
|
[common reverse proxy misconfigurations][proxies] are detected.
|
||||||
|
|
||||||
- Improved [reverse proxy documentation][proxies] to clarify that trust of
|
- Improved [reverse proxy documentation][proxies] to clarify that trust of
|
||||||
`X-Forwarded-Proto` is also necessary.
|
`X-Forwarded-Proto` is also necessary.
|
||||||
|
|
|
@ -780,7 +780,7 @@ these instructions are for that provider; please [contact
|
||||||
us](https://zulip.com/help/contact-support) if you need help using
|
us](https://zulip.com/help/contact-support) if you need help using
|
||||||
this with another IdP.
|
this with another IdP.
|
||||||
|
|
||||||
#### IdP-initated Single Logout
|
#### IdP-initiated Single Logout
|
||||||
|
|
||||||
1. In the KeyCloak configuration for Zulip, enable `Force Name ID Format`
|
1. In the KeyCloak configuration for Zulip, enable `Force Name ID Format`
|
||||||
and set `Name ID Format` to `email`. Zulip needs to receive
|
and set `Name ID Format` to `email`. Zulip needs to receive
|
||||||
|
|
|
@ -19,7 +19,7 @@ geo $realip_remote_addr $is_x_forwarded_proto_trusted {
|
||||||
}
|
}
|
||||||
|
|
||||||
# Check if the IP address that we resolved the request as coming
|
# Check if the IP address that we resolved the request as coming
|
||||||
# (after looking at X-Fowarded-For, if any) from is actually the proxy
|
# (after looking at X-Forwarded-For, if any) from is actually the proxy
|
||||||
# itself.
|
# itself.
|
||||||
geo $remote_addr $is_from_proxy {
|
geo $remote_addr $is_from_proxy {
|
||||||
default 0;
|
default 0;
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 90 KiB After Width: | Height: | Size: 90 KiB |
Binary file not shown.
Before Width: | Height: | Size: 680 KiB After Width: | Height: | Size: 680 KiB |
|
@ -574,7 +574,7 @@ export function parse({raw_content, helper_config}) {
|
||||||
|
|
||||||
// Disable _emphasis_ (keeping *emphasis*)
|
// Disable _emphasis_ (keeping *emphasis*)
|
||||||
// Text inside ** must start and end with a word character
|
// Text inside ** must start and end with a word character
|
||||||
// to prevent mis-parsing things like "char **x = (char **)y"
|
// to prevent misparsing things like "char **x = (char **)y"
|
||||||
marked.InlineLexer.rules.zulip.em = /^\*(?!\s+)((?:\*\*|[\S\s])+?)(\S)\*(?!\*)/;
|
marked.InlineLexer.rules.zulip.em = /^\*(?!\s+)((?:\*\*|[\S\s])+?)(\S)\*(?!\*)/;
|
||||||
|
|
||||||
// Disable autolink as (a) it is not used in our backend and (b) it interferes with @mentions
|
// Disable autolink as (a) it is not used in our backend and (b) it interferes with @mentions
|
||||||
|
|
|
@ -1368,7 +1368,7 @@ def do_convert_data(
|
||||||
# Slack's export doesn't set the UTF-8 flag on each
|
# Slack's export doesn't set the UTF-8 flag on each
|
||||||
# filename entry, despite encoding them as such, so
|
# filename entry, despite encoding them as such, so
|
||||||
# zipfile mojibake's the output. Explicitly re-interpret
|
# zipfile mojibake's the output. Explicitly re-interpret
|
||||||
# it as UTF-8 mis-decoded as cp437, the default.
|
# it as UTF-8 misdecoded as cp437, the default.
|
||||||
for fileinfo in zipObj.infolist():
|
for fileinfo in zipObj.infolist():
|
||||||
fileinfo.flag_bits |= 0x800
|
fileinfo.flag_bits |= 0x800
|
||||||
fileinfo.filename = fileinfo.filename.encode("cp437").decode("utf-8")
|
fileinfo.filename = fileinfo.filename.encode("cp437").decode("utf-8")
|
||||||
|
|
|
@ -1473,7 +1473,7 @@ def get_incoming_message_ids(import_dir: Path, sort_by_date: bool) -> List[int]:
|
||||||
# save memory and speed up the sort. For
|
# save memory and speed up the sort. For
|
||||||
# Zulip-to-Zulip imports, the
|
# Zulip-to-Zulip imports, the
|
||||||
# message_id will generally be a good tiebreaker.
|
# message_id will generally be a good tiebreaker.
|
||||||
# If we occasionally mis-order the ids for two
|
# If we occasionally misorder the ids for two
|
||||||
# messages from the same second, it's not the
|
# messages from the same second, it's not the
|
||||||
# end of the world, as it's likely those messages
|
# end of the world, as it's likely those messages
|
||||||
# arrived to the original server in somewhat
|
# arrived to the original server in somewhat
|
||||||
|
|
|
@ -264,15 +264,15 @@ def build_get_topic_visibility_policy(
|
||||||
"visibility_policy",
|
"visibility_policy",
|
||||||
)
|
)
|
||||||
|
|
||||||
topic_to_visiblity_policy: Dict[Tuple[int, str], int] = defaultdict(int)
|
topic_to_visibility_policy: Dict[Tuple[int, str], int] = defaultdict(int)
|
||||||
for row in rows:
|
for row in rows:
|
||||||
recipient_id = row["recipient_id"]
|
recipient_id = row["recipient_id"]
|
||||||
topic_name = row["topic_name"]
|
topic_name = row["topic_name"]
|
||||||
visibility_policy = row["visibility_policy"]
|
visibility_policy = row["visibility_policy"]
|
||||||
topic_to_visiblity_policy[(recipient_id, topic_name)] = visibility_policy
|
topic_to_visibility_policy[(recipient_id, topic_name)] = visibility_policy
|
||||||
|
|
||||||
def get_topic_visibility_policy(recipient_id: int, topic: str) -> int:
|
def get_topic_visibility_policy(recipient_id: int, topic: str) -> int:
|
||||||
return topic_to_visiblity_policy[(recipient_id, topic.lower())]
|
return topic_to_visibility_policy[(recipient_id, topic.lower())]
|
||||||
|
|
||||||
return get_topic_visibility_policy
|
return get_topic_visibility_policy
|
||||||
|
|
||||||
|
|
|
@ -737,7 +737,7 @@ class HomeTest(ZulipTestCase):
|
||||||
self.assertIn(bots[2].id, bot_ids)
|
self.assertIn(bots[2].id, bot_ids)
|
||||||
self.assertIn(bots[2].id, active_ids)
|
self.assertIn(bots[2].id, active_ids)
|
||||||
|
|
||||||
# Make sure nobody got mis-bucketed.
|
# Make sure nobody got misbucketed.
|
||||||
self.assertNotIn(hamlet.id, non_active_ids)
|
self.assertNotIn(hamlet.id, non_active_ids)
|
||||||
self.assertNotIn(defunct_user.id, active_ids)
|
self.assertNotIn(defunct_user.id, active_ids)
|
||||||
|
|
||||||
|
|
|
@ -1048,8 +1048,8 @@ class RealmImportExportTest(ExportFile):
|
||||||
@getter
|
@getter
|
||||||
def get_group_names_for_group_settings(r: Realm) -> Set[str]:
|
def get_group_names_for_group_settings(r: Realm) -> Set[str]:
|
||||||
return {
|
return {
|
||||||
getattr(r, permmission_name).name
|
getattr(r, permission_name).name
|
||||||
for permmission_name in Realm.REALM_PERMISSION_GROUP_SETTINGS
|
for permission_name in Realm.REALM_PERMISSION_GROUP_SETTINGS
|
||||||
}
|
}
|
||||||
|
|
||||||
# test recipients
|
# test recipients
|
||||||
|
|
|
@ -472,8 +472,8 @@ class PushBouncerNotificationTest(BouncerTestCase):
|
||||||
"apns_payload": apns_payload,
|
"apns_payload": apns_payload,
|
||||||
"gcm_options": gcm_options,
|
"gcm_options": gcm_options,
|
||||||
}
|
}
|
||||||
time_recieved = time_sent + datetime.timedelta(seconds=1, milliseconds=234)
|
time_received = time_sent + datetime.timedelta(seconds=1, milliseconds=234)
|
||||||
with time_machine.travel(time_recieved, tick=False), mock.patch(
|
with time_machine.travel(time_received, tick=False), mock.patch(
|
||||||
"zilencer.views.send_android_push_notification"
|
"zilencer.views.send_android_push_notification"
|
||||||
), mock.patch("zilencer.views.send_apple_push_notification"), self.assertLogs(
|
), mock.patch("zilencer.views.send_apple_push_notification"), self.assertLogs(
|
||||||
"zilencer.views", level="INFO"
|
"zilencer.views", level="INFO"
|
||||||
|
@ -1165,12 +1165,12 @@ class HandlePushNotificationTest(PushNotificationTest):
|
||||||
message=message,
|
message=message,
|
||||||
)
|
)
|
||||||
|
|
||||||
time_recieved = time_sent + datetime.timedelta(seconds=1, milliseconds=234)
|
time_received = time_sent + datetime.timedelta(seconds=1, milliseconds=234)
|
||||||
missed_message = {
|
missed_message = {
|
||||||
"message_id": message.id,
|
"message_id": message.id,
|
||||||
"trigger": NotificationTriggers.DIRECT_MESSAGE,
|
"trigger": NotificationTriggers.DIRECT_MESSAGE,
|
||||||
}
|
}
|
||||||
with time_machine.travel(time_recieved, tick=False), mock.patch(
|
with time_machine.travel(time_received, tick=False), mock.patch(
|
||||||
"zerver.lib.push_notifications.gcm_client"
|
"zerver.lib.push_notifications.gcm_client"
|
||||||
) as mock_gcm, self.mock_apns() as (apns_context, send_notification), self.assertLogs(
|
) as mock_gcm, self.mock_apns() as (apns_context, send_notification), self.assertLogs(
|
||||||
"zerver.lib.push_notifications", level="INFO"
|
"zerver.lib.push_notifications", level="INFO"
|
||||||
|
@ -1232,12 +1232,12 @@ class HandlePushNotificationTest(PushNotificationTest):
|
||||||
message=message,
|
message=message,
|
||||||
)
|
)
|
||||||
|
|
||||||
time_recieved = time_sent + datetime.timedelta(seconds=1, milliseconds=234)
|
time_received = time_sent + datetime.timedelta(seconds=1, milliseconds=234)
|
||||||
missed_message = {
|
missed_message = {
|
||||||
"message_id": message.id,
|
"message_id": message.id,
|
||||||
"trigger": NotificationTriggers.DIRECT_MESSAGE,
|
"trigger": NotificationTriggers.DIRECT_MESSAGE,
|
||||||
}
|
}
|
||||||
with time_machine.travel(time_recieved, tick=False), mock.patch(
|
with time_machine.travel(time_received, tick=False), mock.patch(
|
||||||
"zerver.lib.push_notifications.gcm_client"
|
"zerver.lib.push_notifications.gcm_client"
|
||||||
) as mock_gcm, self.mock_apns() as (apns_context, send_notification), self.assertLogs(
|
) as mock_gcm, self.mock_apns() as (apns_context, send_notification), self.assertLogs(
|
||||||
"zerver.lib.push_notifications", level="INFO"
|
"zerver.lib.push_notifications", level="INFO"
|
||||||
|
|
|
@ -41,7 +41,7 @@ def sentry_tunnel(
|
||||||
# debugging more complicated.
|
# debugging more complicated.
|
||||||
updated_body = request.body
|
updated_body = request.body
|
||||||
# If we fail to update the body for any reason, leave it as-is; it
|
# If we fail to update the body for any reason, leave it as-is; it
|
||||||
# is better to mis-report the IP than to drop the report entirely.
|
# is better to misreport the IP than to drop the report entirely.
|
||||||
with suppress(Exception):
|
with suppress(Exception):
|
||||||
# This parses the Sentry ingestion format, known as an
|
# This parses the Sentry ingestion format, known as an
|
||||||
# Envelope. See https://develop.sentry.dev/sdk/envelopes/ for
|
# Envelope. See https://develop.sentry.dev/sdk/envelopes/ for
|
||||||
|
|
Loading…
Reference in New Issue