Claire
f800057008
Merge commit 'b8444d9bb7885d75112a3cae74b6a5c711c7d547' into glitch-soc/merge-upstream
2025-10-08 18:07:04 +02:00
Claire
a7f89d13d2
Change index on follows table to improve performance of some queries ( #36374 )
2025-10-07 12:37:40 +00:00
Claire
73a625c284
Merge commit '4dc21d7afdb485402555908bc72d071f8b25ec36' into glitch-soc/merge-upstream
...
Conflicts:
- `config/settings.yml`:
Upstream replaced a setting with 4 new ones, while glitch-soc had modified
the default value of that setting.
Removed the old setting and added the new settings, but with defaults
matching glitch-soc's previous behavior.
2025-10-06 19:24:16 +02:00
Claire
2d2c525097
Split timeline_preview setting into more granular settings ( #36338 )
2025-10-06 08:34:05 +00:00
Claire
b6c53c1129
Merge commit '150f0fcba5585782e2cac49d971904f02d5e6fbd' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
Upstream refactored a part of the code where glitch-soc has changed the code
to potentially hide followers count.
Adapt upstream's changes.
2025-09-29 18:41:46 +02:00
Claire
150f0fcba5
Add support for numeric-based URIs for local accounts ( #32724 )
2025-09-29 12:05:48 +00:00
Claire
cc52833296
Merge commit '38fa0102c111f1c0cff5a42eba6882ffae4ca109' into glitch-soc/merge-upstream
2025-09-15 18:39:09 +02:00
Claire
f5591346cc
Add following_url to accounts ( #36093 )
2025-09-15 13:45:57 +00:00
Claire
9f97df84da
Merge commit '45a996f12b04f88e0774bc6d6b52452ce39b612f' into glitch-soc/merge-upstream
2025-09-11 21:20:15 +02:00
Claire
f7289b251f
Add migration to fill unset default quote policy based on default post privacy ( #36041 )
2025-09-11 10:11:31 +00:00
Claire
06f45a2046
Merge commit 'eb118d85238da8d0583868abab2756bb329742ba' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream updated dependencies textually adjacent to glitch-soc-only ones.
Updated them as upstream did.
2025-09-10 18:11:12 +02:00
Claire
e1dc960219
Rework FEP-7888 implementation ( #36064 )
2025-09-09 18:27:30 +00:00
Jesse Karmani
65b4a0a6f1
Implement FEP 7888: Part 1 - publish conversation context ( #35959 )
2025-09-05 19:28:29 +00:00
Claire
e8fe33f273
Merge commit '7aba79ade9bfeb86105aa575bc7156acef78f7da' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Conflict because of glitch-soc's theming system.
Updated the line as upstream did.
2025-08-25 22:15:28 +02:00
Claire
2560242972
Add quotes_count to statuses stats ( #35832 )
2025-08-25 12:21:28 +00:00
Claire
71cee3e472
Merge commit 'f16f8b51b863d3fcadd17753004adbf8962ead01' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream updated a dependency adjacent to one that is only in glitch-soc.
Updated as upstream did.
2025-08-19 18:46:12 +02:00
Claire
736751e5de
Change indexes on quotes to efficiently list quotes of a given account or quoted status ( #35819 )
2025-08-19 12:50:30 +00:00
Claire
11902d958f
Merge commit 'ce1680e6f979889ebd5c775353f3b82a8b2698bb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
Upstream added a new helper for a setting, where glitch-soc had extra ones.
Not a real conflict, added upstream's new helper without removing glitch-soc's ones.
2025-08-09 23:02:43 +02:00
David Roetzel
868c46bc76
Add delivery failure handling to FASP jobs ( #35723 )
2025-08-08 09:46:09 +00:00
Claire
e53421b548
Merge commit 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream
...
Conflicts:
- `config/settings.yml`:
Not a real conflict, upstream removed settings that are identical in glitch-soc
but textually adjacent to glitch-soc-only settings.
Removed what upstream removed.
2025-07-30 20:05:45 +02:00
Eugen Rochko
20bbd20ef1
Add ability to block words in usernames ( #35407 )
2025-07-29 10:19:15 +00:00
David Roetzel
f1b9868980
Bypass registration checks for seeded admin user ( #35565 )
2025-07-28 13:25:16 +00:00
Claire
e2a867507c
Merge commit 'e9170e2de1d75e02f04ad39f2af131c70189fb50' into glitch-soc/merge-upstream
2025-07-10 01:10:32 +02:00
Matt Jankowski
1e2d77f2c7
Use if_exists: true when removing duplicate indexes ( #35309 )
2025-07-09 08:45:29 +00:00
Claire
2eec4da8fc
Merge commit 'c357a7f8d697ede4df4be74456b0497118c9d049' into glitch-soc/merge-upstream
2025-06-30 17:52:22 +02:00
David Roetzel
bae258925c
Persist follow recommendations from FASP ( #35218 )
2025-06-30 13:39:36 +00:00
Claire
c9a1e27a49
Merge commit 'dbb20f76a781defe35d077529c8269d712c1fbd2' into glitch-soc/merge-upstream
...
Conflicts:
- `tsconfig.json`:
glitch-soc had extra paths under `app/javascript/flavours`, but upstream
added `app/javascript` as a whole, so updated to upstream's.
2025-06-25 19:29:09 +02:00
Emelia Smith
72f2f35bfb
Implement Instance Moderation Notes ( #31529 )
2025-06-25 08:15:44 +00:00
Matt Jankowski
47fda2df2c
Update OAuth inflection to match spec ( #35160 )
2025-06-25 07:52:30 +00:00
Claire
2085b0b53a
Merge commit '520974e05211e988b0447f7f29e88798b1794bcf' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/rest/status_serializer.rb`:
Not a real conflict, just glitch-soc code textually adjacent to code added
upstream.
2025-06-05 18:02:40 +02:00
Claire
3d474807bf
Change “legacy” non-fast-tracked quote posts to not be displayed as such ( #34945 )
2025-06-05 13:53:57 +00:00
Claire
e8f713ba57
Merge commit '47512fe51867fd30f13e02731a9733fa971e8837' into glitch-soc/merge-upstream
2025-05-26 18:46:50 +02:00
Claire
b7e967817b
Fix unnecessary requirement for deprecated OTP_SECRET environment variable ( #34810 )
2025-05-26 11:59:54 +00:00
Claire
b031f65670
Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream
2025-05-25 14:51:59 +02:00
Claire
f622686397
Merge commit '90f7b90223ce3212a2bb9746a119bcc9287b3237' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream updated dependencies, including one textually adjacent to a
glitch-soc-only dependency.
Updated dependencies as upstream did.
2025-05-25 14:38:25 +02:00
Claire
8c51a8ba94
Add ability to translate server rules ( #34494 )
2025-05-21 11:54:12 +00:00
Matt Jankowski
4709121f72
Remove Legacy OTP Secret code ( #34743 )
2025-05-20 14:51:19 +00:00
Claire
c327451300
Merge commit 'a5a2c6dc7ec0d8af53594cd53a90da7d6fbefd5a' into glitch-soc/merge-upstream
2025-05-16 17:36:28 +02:00
Claire
8cc5084ca1
Add interstitial for Terms of Service updates ( #34527 )
2025-05-16 14:03:05 +00:00
David Roetzel
a5a2c6dc7e
Add support for FASP data sharing ( #34415 )
2025-05-16 12:24:02 +00:00
Claire
3ec3814f8e
Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream
2025-05-03 17:37:26 +02:00
Claire
9ed6a14d45
Add support for ingesting quote policies ( #34479 )
2025-04-28 08:48:27 +00:00
Claire
8f59b63176
Change quote IDs to use snowflake IDs ( #34551 )
2025-04-25 23:24:26 +00:00
Claire
dae6f19490
Merge commit '7a70d9543525681b5c408cfd17782843da13177f' into glitch-soc/merge-upstream
2025-04-25 17:22:10 +02:00
Claire
7bc301e184
Make Web::PushSubscription#user and Web::PushSubscription#access_token relationships non-optional ( #34498 )
...
Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com >
2025-04-23 08:12:31 +00:00
Claire
ace0a3d61f
Merge commit 'b33f9ea60338a78dde2fb7fe3f083c2ffaafcf1f' into glitch-soc/merge-upstream
2025-04-21 15:22:22 +02:00
Claire
df2611a10f
Add initial support for ingesting and verifying remote quote posts ( #34370 )
2025-04-17 07:45:23 +00:00
Claire
4e6c7fba78
Merge commit '678c8dfeec2c221cf609b924161dc03cebfa41e1' into glitch-soc/merge-upstream
2025-04-10 17:50:04 +02:00
Matt Jankowski
4c2f64907b
Remove deprecated Import model ( #34371 )
2025-04-10 12:49:24 +00:00
Claire
f8b0f38636
Merge commit '902aab1245a06319b7acd20045bd9ce051627300' into glitch-soc/merge-upstream
2025-03-29 17:02:39 +01:00
