c2817c7fad
Merge commit '752d49eefef48262d501ba5fc2006d2c8466a000' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/feed_manager.rb`:
Upstream changed how notifications from follow subscriptions were handled,
refactoring this file in the process.
Conflict is due to glitch-soc having an extra timeline type (direct).
Ported upstream's changes.
- `app/workers/feed_insert_worker.rb`:
Ditto.
2024-12-02 21:08:15 +01:00
a17e7d10fc
Always validate `inbox_url` presence on Relay ( #32364 )
2024-12-02 07:38:06 +00:00
7d52d5df0f
Merge commit 'c58967c3bd7b7eee0b284ee2b77a48ed9ce6863e' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Conflict due to upstream adding fallback support for MathML Core while
glitch-soc supported slightly more tags than upstream.
Added the MathML Core fallback code to glitch-soc.
- `spec/lib/sanitize/config_spec.rb`:
Ditto.
2024-12-01 18:22:00 +01:00
48827e1210
Merge commit 'a27bafa59653328a0f06bedb1dfb2b6ee92af43d' into glitch-soc/merge-upstream
...
- `app/controllers/application_controller.rb`:
Minor conflict due to glitch-soc's theming system.
- `spec/helpers/application_helper_spec.rb`:
Minor conflict due to glitch-soc's theming system.
2024-12-01 17:36:49 +01:00
48f3ed738f
Fix list error messages ( #33082 )
2024-11-28 10:13:06 +00:00
46c43d263c
Change avatar and header size limits from 2MB to 8MB when using libvips ( #33002 )
2024-11-26 21:01:52 +00:00
a27bafa596
Add `UserRole#bypass_block?` method for notification check ( #32974 )
2024-11-26 09:45:47 +00:00
9a7130d6da
Fix direct inbox delivery pushing posts into inactive followers' timelines ( #33067 )
2024-11-25 15:54:18 +00:00
2d8fed23e6
Fix `TagFollow` records not being correctly handled in account operations ( #33063 )
2024-11-25 10:27:58 +00:00
74df47ad9c
Add coverage for `Webhook` validations ( #33026 )
2024-11-25 08:19:16 +00:00
f740611820
Merge commit 'd0753ec276502ea28a1e853cbc6487020a0602e3' into glitch-soc/merge-upstream
2024-11-24 18:56:15 +01:00
6374937147
Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/trends/statuses.rb`:
Upstream added a date restriction to trendable posts, while glitch-soc had
slightly different conditions.
Added the date restriction to glitch-soc's conditions.
2024-11-24 16:46:28 +01:00
d75088d699
Fix pushing hashtag-followed posts to feeds of inactive users ( #33018 )
2024-11-22 08:30:57 +00:00
e68b26c8df
Fix posts made in the future being allowed to trend ( #32996 )
2024-11-20 12:41:22 +00:00
37f00fb018
Use hash arguments to `group` when possible ( #32916 )
2024-11-19 10:36:02 +00:00
2b5faa2ba3
Change lists to reflect added and removed users retroactively ( #32930 )
2024-11-19 10:04:12 +00:00
f2976ec9a4
Extract `Notification::Groups` concern ( #32968 )
2024-11-19 10:02:01 +00:00
da826fe959
Use hash arguments to `order` when possible (Rails 7.2) ( #32915 )
2024-11-18 15:07:53 +00:00
477412d62a
Use hash arguments to `select` when possible (Rails 7.2) ( #32917 )
2024-11-18 14:58:45 +00:00
1c6f53e70f
Use `with_options` blocks in `Associations` concern ( #32840 )
2024-11-18 08:07:18 +00:00
4f1242964b
Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream
2024-11-15 18:44:32 +01:00
319109029d
Fix logic in "last used at per application" oauth token list ( #32912 )
2024-11-15 15:52:37 +00:00
34d7c9edae
Rails 7+: primary_abstract_class recommendation ( #32909 )
2024-11-15 15:37:30 +00:00
766358e52b
Add coverage for malformed version cleanup in `SoftwareUpdateCheckService`, add helper query methods ( #32876 )
2024-11-14 14:03:57 +00:00
62d65504f6
Add `DomainResource` class to wrap MX lookup/normalize ( #32864 )
2024-11-14 13:47:29 +00:00
8f5cbf5370
Fix list creation limit check ( #32869 )
2024-11-13 10:22:11 +00:00
5d9dde3ec0
Add age/expiry duration constants to `BulkImport` class ( #32839 )
2024-11-12 08:57:06 +00:00
a34edc211f
Add audit logging to Relays ( #32819 )
2024-11-12 08:35:08 +00:00
c099797700
Use `mastodon` config namespace to load software update default value via `config_for` ( #30534 )
2024-11-12 08:28:31 +00:00
c78dc23b49
Move account sensitize-related methods to concern ( #28865 )
2024-11-11 13:08:23 +00:00
d033920b7e
Move account silence-related methods to concern ( #28866 )
2024-11-11 08:29:55 +00:00
f0f807cec7
Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream
2024-11-10 13:18:43 +01:00
10c895dc84
Use existing arel scopes instead of string ordering ( #32801 )
2024-11-08 14:21:44 +00:00
bde0f1239a
Add `InetContainer` with scopes of `containing` and `contained` ( #32802 )
2024-11-08 10:08:36 +00:00
df54196a14
Use `touch_all` with batches ( #32799 )
2024-11-08 10:00:15 +00:00
41227aeb95
Update Rails to version 7.2.2 ( #30391 )
2024-11-07 14:58:20 +00:00
697947116e
Add `EmailDomainBlock.parents` scope ( #31968 )
2024-11-07 13:46:20 +00:00
68b545ef33
Add `Status.not_direct_visibility` scope ( #32065 )
2024-11-07 10:32:33 +00:00
73f66af6eb
Update location of unused `MIN_SCHEDULE_OFFSET` constant ( #31217 )
2024-11-07 10:28:59 +00:00
2bea74e69d
Avoid latest featured tag use on post removal unless necessary ( #32787 )
2024-11-06 10:51:54 +00:00
d6349c0e9a
Add year in review feature to web UI ( #32709 )
2024-11-05 14:40:07 +00:00
90f4ffa31d
Fix performance of percentile calculation for annual reports ( #32765 )
2024-11-04 10:11:06 +00:00
f624ef2778
Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/formatting_helper.rb`:
Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
Wrapped the modified code.
2024-11-03 20:51:58 +01:00
b231c3c1bf
Drop support for ruby 3.1 ( #32363 )
2024-10-31 15:12:08 +00:00
a20ac20302
Add model spec for `Tombstone` ( #32697 )
2024-10-31 13:27:47 +00:00
babee06794
Add coverage for `StatusTrend` and `PreviewCardTrend` models, add `locales` class method to `RankedTrend` ( #32688 )
2024-10-29 15:46:32 +00:00
1edb527072
Enhance coverage for `StatusPin` model ( #32515 )
2024-10-28 07:34:58 +00:00
9074c1fac9
Use `likes` and `shares` totalItems on status creations and updates ( #32620 )
2024-10-28 04:55:18 +00:00
8103e69b17
Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
Conflict caused by glitch-soc changing the path to images, and upstream
removing styling using such an image.
Removed the styling as upstream did.
- `app/models/account.rb`:
Conflict due to upstream changing lines adjacent to a change made in glitch-soc
to have configurable limits.
Ported upstream's changes.
- `yarn.lock`:
Dependencies adjacent to glitch-soc-only dependencies updated.
Updated them as well.
2024-10-26 13:38:07 +02:00
66c0471515
Enrich coverage for `IpBlock` model ( #32471 )
2024-10-25 08:35:07 +00:00
Claire