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
2f906ed55a
Constants for account refresh ( #32420 )
2024-10-23 13:29:01 +00:00
05f23df3b7
Add endpoint to remove web push subscription ( #32626 )
2024-10-23 08:02:31 +00:00
18659f8163
Fix that blocking was not working on link timeline ( #32625 )
2024-10-22 12:46:32 +00:00
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
2391937e11
Fix follow recommendation moderation page default language when using regional variant ( #32580 )
2024-10-18 10:21:25 +00:00
4d9b4ef72f
Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream
2024-10-14 19:46:52 +02:00
d8eab3d81f
Reinforce coverage for `DomainBlock` model ( #32473 )
2024-10-14 12:51:01 +00:00
b0dd38433b
Fix follow recommendation suppressions not applying immediately ( #32392 )
2024-10-14 08:18:25 +00:00
d9fbb071da
Fix notification requests from suspended accounts still being listed ( #32354 )
2024-10-09 17:29:02 +00:00
258dce1256
Add `OpenSSL::SSL::SSLError` to http connection errors wrapper ( #32307 )
2024-10-08 14:59:51 +00:00
e8ec6667bd
Extract wrapper constant for `HTTP::*` error classes ( #32285 )
2024-10-08 13:53:35 +00:00
7e06d724c9
Merge commit '4238da6ee3c93dfd5752e9133cbec958f8ebb18a' into glitch-soc/merge-upstream
2024-10-07 20:45:07 +02:00
bfabd6a2b8
Move account suspension-related methods to concern ( #28351 )
2024-10-07 12:02:04 +00:00
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
d95f6f4410
Extract `ExportSummary` class for account object counts ( #32227 )
2024-10-03 13:09:58 +00:00
36f9c96812
Clean up labels on development application form ( #32116 )
2024-10-02 14:45:12 +00:00
2151dfb8d6
Add `relevant_params` to ReportFilter (matches account filter) ( #32136 )
2024-10-02 13:24:40 +00:00
1f65a95421
Remove unneeded `reorder(nil)` conditions ( #32200 )
2024-10-02 12:26:16 +00:00
4aa26eba53
Extract `WebPushRequest` from push notification worker and subscription ( #32208 )
2024-10-02 11:11:52 +00:00
ec16ed37c3
Extract constants for header and avatar geometry ( #32151 )
2024-10-01 11:36:25 +00:00
e975b55c24
Remove `WebfingerHelper` module & move usage inline ( #31203 )
2024-10-01 09:54:42 +00:00
e6cda8388c
Move OTP secret length to configuration ( #32125 )
2024-10-01 09:38:42 +00:00
9af9ef6fb3
Merge commit '03210085b7481568cc507f088144aaf1dae73c88' into glitch-soc/merge-upstream
2024-09-30 13:04:19 +02:00
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
7ef25ae53b
Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream
2024-09-29 11:06:09 +02:00
e02e88bff4
Use previously extracted model constants in form `maxlength` attributes ( #32113 )
2024-09-27 08:21:27 +00:00
633165ba9c
Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream
2024-09-25 17:41:37 +02:00
d6f5ee75ab
Add notification grouping for follow notifications ( #32085 )
2024-09-25 13:36:19 +00:00
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
04a939d640
Add `reviewed` and `unreviewed` scopes to `Reviewable` model concern ( #31988 )
2024-09-20 08:51:37 +00:00
5405bdd344
Remove unused E2EE messaging code ( #31193 )
2024-09-18 09:27:43 +00:00
665e9129fe
Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/custom_emoji.rb`:
An upstream refactor touched lines adjacent to ones modified in glitch-soc.
Ported upstream's changes.
2024-09-16 21:08:58 +02:00
abd2f5654a
Add validation coverage for `CustomEmoji` shortcode value ( #31906 )
2024-09-16 07:53:03 +00:00
4b40d13cb3
Increase preview card image size limit from 2MB to 8MB when using libvips ( #31904 )
2024-09-14 00:16:02 +00:00
117ac13d12
Merge commit '5ba3405be4c1f708f198580b481f822698dab392' into glitch-soc/merge-upstream
2024-09-13 21:37:34 +02:00
c1b2c4fd9a
Strip protocol from attribution domains ( #31900 )
2024-09-13 11:37:15 +00:00
ba81e4e019
Fix inability to locally suspend remotely-suspended accounts in moderation interface ( #31899 )
2024-09-13 09:11:10 +00:00
a2c4f5f5c0
Add coverage for `ListAccount` follow/follow_request set up ( #31896 )
2024-09-13 08:49:03 +00:00
49cbee3836
Remove unused argument from `AccountMigration.within_cooldown` ( #31892 )
2024-09-13 08:43:21 +00:00
83b553c7d1
Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream
2024-09-12 21:32:39 +02:00
8cdc148167
Handle invalid visibility ( #31571 )
2024-09-12 13:29:55 +00:00
17c57c46e7
Add coverage for title/limit validations in `List` model ( #31869 )
2024-09-12 13:25:23 +00:00
10e2b87774
Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream
2024-09-12 12:09:21 +02:00
b240bad61a
Merge commit '5260233b81c301cf7b0c79b179858748b693460b' into glitch-soc/merge-upstream
2024-09-11 20:58:35 +02:00
da07adfe6c
Add `CustomEmoji.enabled` scope ( #31830 )
2024-09-10 13:21:40 +00:00
e0c27a5047
Add ability to manage which websites can credit you in link previews ( #31819 )
2024-09-10 12:00:40 +00:00
5b995143f1
Use `with_options` for shared Account validation option value ( #31827 )
2024-09-10 08:03:45 +00:00
d0ab94c4d2
Add `FeaturedTag` coverage, use `pick` in model ( #31828 )
2024-09-09 19:57:19 +00:00
441af2632d
Merge commit '2caa3f365ded73be17b623177967110e66f14061' into glitch-soc/merge-upstream
2024-09-09 18:22:41 +02:00
e6969cf4e4
Add method for media-referencing status in `AccountStatusCleanupPolicy` ( #31798 )
2024-09-09 08:33:51 +00:00
82161d8ae5
Change Account::Field parsing to use HTML5::DocumentFragment ( #31813 )
2024-09-08 18:56:18 +00:00
29124990a2
Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream reworked how CSS classes for the document's body are computed.
Slight conflict due to glitch-soc's different theming system.
Updated as upstream did.
2024-09-06 19:25:31 +02:00
c88ba523ee
Fix sort order of moderation notes on Reports and Accounts ( #31528 )
2024-09-06 14:58:36 +00:00
fd7fc7bdc3
Disable actions on reports that have already been taken ( #31773 )
2024-09-06 12:50:30 +00:00
be77a1098b
Extract `Account::AUTOMATED_ACTOR_TYPES` for "bot" actor_type values ( #31772 )
2024-09-06 07:49:38 +00:00
5a55180b95
Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
Upstream rewrote top-level `describe` calls to `RSpec.describe`, and
glitch-soc had differences in the first few tests because of the wider
subset of HTML it accepts.
Changed `describe` to `RSpec.describe` as upstream did, keeping
glitch-soc's tests.
2024-09-04 19:38:52 +02:00
58df00f04d
Extract method for self-referencing records in `AccountStatusCleanupPolicy` ( #31244 )
2024-09-04 08:52:37 +00:00
fef055db96
Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v1/timelines/tag_spec.rb`:
Upstream refactored this file, while we had a change to switch a default setting.
Updated as upstream did.
- `spec/views/statuses/show.html.haml_spec.rb`:
Upstream refactored this file, while we stubbed different methods.
Updated as upstream did, and updated the stubs accordingly.
2024-09-03 21:51:53 +02:00
7c26e5e4a1
Add `Reviewable` model concern ( #31152 )
2024-09-03 15:37:45 +00:00
2f0d0fc127
Add coverage for `CLI::Accounts#fix_duplications` task ( #30639 )
2024-09-03 15:36:59 +00:00
ac4002fe08
Merge commit '611533cd12059d365ca0267342b750e615637bd4' into glitch-soc/merge-upstream
2024-09-03 12:12:23 +02:00
48379e62e4
Remove unused `User#inactive_message` method ( #31698 )
2024-09-03 08:04:00 +00:00
406b8211f5
Remove unused `Mention#active?` method ( #31697 )
2024-09-03 08:03:25 +00:00
402c1e116d
Merge commit '491033c86cc9c29302bfe68cc94dabad82ded4cc' into glitch-soc/merge-upstream
2024-09-02 17:43:10 +02:00
388d5473e1
Refactor (ruby) redis configuration ( #31694 )
2024-09-02 14:19:55 +00:00
a23b3747ac
Fix N+1s in grouped notifications ( #31638 )
2024-09-02 09:56:00 +00:00
6f35e93f72
Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream
2024-08-31 16:06:04 +02:00
ad0a28a8bf
Add `grouped_types` parameter to allow clients to restrict which notifications types get grouped ( #31594 )
2024-08-29 12:39:07 +00:00
f5c0c32edd
Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/material-icons/400-24px/chat.svg`:
Glitch-soc used this one but not upstream.
Upstream pulled a presumably more up-to-date version of the file.
Switched to upstream's version.
- `app/views/layouts/application.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
- `app/views/layouts/embedded.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
- `app/views/layouts/error.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
2024-08-20 18:31:50 +02:00
711e1fce0a
Fix pagination parameters in `GET /api/v2_alpha/notificatins` ( #31509 )
2024-08-20 13:54:08 +00:00
1760f84349
Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream
2024-08-19 18:25:31 +02:00
d4f135bc6d
Fix in memoriam accounts appearing in follow recommendations ( #31474 )
...
Co-authored-by: Utkarsh Wankar <46633523+kernal053@users.noreply.github.com>
2024-08-19 15:55:42 +00:00
99051479c1
Fix Trending Tags pending review having an unstable sort order ( #31473 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-08-19 13:25:40 +00:00
169b35869f
Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream
2024-08-14 21:17:43 +02:00
95c11d365d
Don't push to cache buster if attachment path is nil ( #31414 )
2024-08-14 08:57:42 +00:00
02df1b4e4a
Finish email allow/deny list naming migration ( #30530 )
2024-08-13 07:37:32 +00:00
31a00c0c1a
Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream
2024-08-09 17:15:32 +02:00
cbdd8edf68
Revamp notification policy options ( #31343 )
2024-08-09 13:30:55 +00:00
Matt Jankowski