Claire
f0f807cec7
Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream
2024-11-10 13:18:43 +01:00
Matt Jankowski
10c895dc84
Use existing arel scopes instead of string ordering ( #32801 )
2024-11-08 14:21:44 +00:00
Matt Jankowski
bde0f1239a
Add InetContainer with scopes of containing and contained ( #32802 )
2024-11-08 10:08:36 +00:00
Matt Jankowski
df54196a14
Use touch_all with batches ( #32799 )
2024-11-08 10:00:15 +00:00
Matt Jankowski
41227aeb95
Update Rails to version 7.2.2 ( #30391 )
2024-11-07 14:58:20 +00:00
Matt Jankowski
697947116e
Add EmailDomainBlock.parents scope ( #31968 )
2024-11-07 13:46:20 +00:00
Matt Jankowski
68b545ef33
Add Status.not_direct_visibility scope ( #32065 )
2024-11-07 10:32:33 +00:00
Matt Jankowski
73f66af6eb
Update location of unused MIN_SCHEDULE_OFFSET constant ( #31217 )
2024-11-07 10:28:59 +00:00
Claire
2bea74e69d
Avoid latest featured tag use on post removal unless necessary ( #32787 )
2024-11-06 10:51:54 +00:00
Eugen Rochko
d6349c0e9a
Add year in review feature to web UI ( #32709 )
2024-11-05 14:40:07 +00:00
Eugen Rochko
90f4ffa31d
Fix performance of percentile calculation for annual reports ( #32765 )
2024-11-04 10:11:06 +00:00
Claire
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
Matt Jankowski
b231c3c1bf
Drop support for ruby 3.1 ( #32363 )
2024-10-31 15:12:08 +00:00
Matt Jankowski
a20ac20302
Add model spec for Tombstone ( #32697 )
2024-10-31 13:27:47 +00:00
Matt Jankowski
babee06794
Add coverage for StatusTrend and PreviewCardTrend models, add locales class method to RankedTrend ( #32688 )
2024-10-29 15:46:32 +00:00
Matt Jankowski
1edb527072
Enhance coverage for StatusPin model ( #32515 )
2024-10-28 07:34:58 +00:00
Jonny Saunders
9074c1fac9
Use likes and shares totalItems on status creations and updates ( #32620 )
2024-10-28 04:55:18 +00:00
Claire
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
Matt Jankowski
66c0471515
Enrich coverage for IpBlock model ( #32471 )
2024-10-25 08:35:07 +00:00
Matt Jankowski
2f906ed55a
Constants for account refresh ( #32420 )
2024-10-23 13:29:01 +00:00
David Roetzel
05f23df3b7
Add endpoint to remove web push subscription ( #32626 )
2024-10-23 08:02:31 +00:00
Jeong Arm
18659f8163
Fix that blocking was not working on link timeline ( #32625 )
2024-10-22 12:46:32 +00:00
Claire
6281c4dedd
Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream
...
Conflicts:
- `.env.production.sample`:
Upstream added a block of three environment variables, while glitch-soc
has a different version of the file overall.
Added upstream's changes.
- `app/helpers/application_helper.rb`:
Upstream added a helper, while glitch-soc had extra helpers.
Added upstream's helper.
2024-10-19 19:13:32 +02:00
Claire
2391937e11
Fix follow recommendation moderation page default language when using regional variant ( #32580 )
2024-10-18 10:21:25 +00:00
Claire
4d9b4ef72f
Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream
2024-10-14 19:46:52 +02:00
Matt Jankowski
d8eab3d81f
Reinforce coverage for DomainBlock model ( #32473 )
2024-10-14 12:51:01 +00:00
Claire
b0dd38433b
Fix follow recommendation suppressions not applying immediately ( #32392 )
2024-10-14 08:18:25 +00:00
Claire
d9fbb071da
Fix notification requests from suspended accounts still being listed ( #32354 )
2024-10-09 17:29:02 +00:00
Matt Jankowski
258dce1256
Add OpenSSL::SSL::SSLError to http connection errors wrapper ( #32307 )
2024-10-08 14:59:51 +00:00
Matt Jankowski
e8ec6667bd
Extract wrapper constant for HTTP::* error classes ( #32285 )
2024-10-08 13:53:35 +00:00
Claire
7e06d724c9
Merge commit '4238da6ee3c93dfd5752e9133cbec958f8ebb18a' into glitch-soc/merge-upstream
2024-10-07 20:45:07 +02:00
Matt Jankowski
bfabd6a2b8
Move account suspension-related methods to concern ( #28351 )
2024-10-07 12:02:04 +00:00
Claire
b28ce2424c
Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper where glitch-soc had its own, not really
a conflict.
Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream renamed a constant that was used slightly differently in glitch-soc.
Renamed it as upstream did.
2024-10-06 16:07:58 +02:00
Matt Jankowski
d95f6f4410
Extract ExportSummary class for account object counts ( #32227 )
2024-10-03 13:09:58 +00:00
Matt Jankowski
36f9c96812
Clean up labels on development application form ( #32116 )
2024-10-02 14:45:12 +00:00
Matt Jankowski
2151dfb8d6
Add relevant_params to ReportFilter (matches account filter) ( #32136 )
2024-10-02 13:24:40 +00:00
Matt Jankowski
1f65a95421
Remove unneeded reorder(nil) conditions ( #32200 )
2024-10-02 12:26:16 +00:00
Matt Jankowski
4aa26eba53
Extract WebPushRequest from push notification worker and subscription ( #32208 )
2024-10-02 11:11:52 +00:00
Matt Jankowski
ec16ed37c3
Extract constants for header and avatar geometry ( #32151 )
2024-10-01 11:36:25 +00:00
Matt Jankowski
e975b55c24
Remove WebfingerHelper module & move usage inline ( #31203 )
2024-10-01 09:54:42 +00:00
David Roetzel
e6cda8388c
Move OTP secret length to configuration ( #32125 )
2024-10-01 09:38:42 +00:00
Claire
9af9ef6fb3
Merge commit '03210085b7481568cc507f088144aaf1dae73c88' into glitch-soc/merge-upstream
2024-09-30 13:04:19 +02:00
Claire
0c872beed4
Merge commit from fork
...
This should not change the set of words matched by `USERNAME_RE` but does
change the one matched by `MENTION_RE`. Indeed, the previous regexp allowed
a domain part to start with `.` or `-`, which the new regexp does not allow.
2024-09-30 12:25:54 +02:00
Claire
7ef25ae53b
Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream
2024-09-29 11:06:09 +02:00
Matt Jankowski
e02e88bff4
Use previously extracted model constants in form maxlength attributes ( #32113 )
2024-09-27 08:21:27 +00:00
Claire
633165ba9c
Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream
2024-09-25 17:41:37 +02:00
Renaud Chaput
d6f5ee75ab
Add notification grouping for follow notifications ( #32085 )
2024-09-25 13:36:19 +00:00
Claire
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
Matt Jankowski
04a939d640
Add reviewed and unreviewed scopes to Reviewable model concern ( #31988 )
2024-09-20 08:51:37 +00:00
Matt Jankowski
5405bdd344
Remove unused E2EE messaging code ( #31193 )
2024-09-18 09:27:43 +00:00
