Skip to content

Commit f15460c

Browse files
authored
Merge branch 'develop' into na/web/pub-trips-tab
2 parents a8b29da + 3489da0 commit f15460c

79 files changed

Lines changed: 2414 additions & 1465 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

app/backend/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies = [
2121
"opentelemetry-exporter-otlp>=1.29.0",
2222
"opentelemetry-instrumentation-grpc>=0.50b0",
2323
"opentelemetry-instrumentation-sqlalchemy>=0.50b0",
24-
"opentelemetry-instrumentation-threading>=0.50b0",
24+
"opentelemetry-instrumentation-threading>=0.63b1",
2525
"opentelemetry-sdk>=1.41.1",
2626
"Pillow>=11.0.0",
2727
"phonenumbers>=9.0.4",

app/backend/resources/languages.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -607,6 +607,10 @@
607607
"code": "kpe",
608608
"name": "Kpelle"
609609
},
610+
{
611+
"code": "kri",
612+
"name": "Krio"
613+
},
610614
{
611615
"code": "kru",
612616
"name": "Kurukh"
@@ -751,6 +755,10 @@
751755
"code": "mos",
752756
"name": "Mossi"
753757
},
758+
{
759+
"code": "mri",
760+
"name": "Māori"
761+
},
754762
{
755763
"code": "msa",
756764
"name": "Malay"
@@ -1071,6 +1079,10 @@
10711079
"code": "tok",
10721080
"name": "Toki Pona"
10731081
},
1082+
{
1083+
"code": "tpi",
1084+
"name": "Tok Pisin"
1085+
},
10741086
{
10751087
"code": "tsm",
10761088
"name": "Sign Language: Turkish"

app/backend/src/couchers/constants.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,3 +129,5 @@
129129

130130
# How long a container must run uninterrupted before /status reports stable=true
131131
STABLE_THRESHOLD_SECONDS = 5 * 60
132+
133+
MODERATION_AUTO_APPROVE_FLAG_PRIORITY = 1000

0 commit comments

Comments
 (0)