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
97b18d10b4
Move hcaptcha service config to `config_for` yml ( #30662 )
2024-10-23 14:25:43 +00:00
05f23df3b7
Add endpoint to remove web push subscription ( #32626 )
2024-10-23 08:02:31 +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
227d46883f
Translate to regional language variant (e.g. pt-BR) ( #32428 )
2024-10-15 13:26:20 +00:00
4d9b4ef72f
Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream
2024-10-14 19:46:52 +02: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
4238da6ee3
Add error message when user tries to follow their own account ( #31910 )
2024-10-07 12:05:46 +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
4fe7f213a6
Use `async_count` in more view locations ( #32086 )
2024-10-04 12:29:43 +00:00
49407e7623
Fix Content-Security-Policy when using sso-redirect ( #32241 )
2024-10-04 08:50:36 +00:00
d95f6f4410
Extract `ExportSummary` class for account object counts ( #32227 )
2024-10-03 13:09:58 +00:00
33d3ca7cf1
Support /.well-known/host-meta.json ( #32206 )
2024-10-02 09:23:44 +00:00
e6cda8388c
Move OTP secret length to configuration ( #32125 )
2024-10-01 09:38:42 +00:00
7ef25ae53b
Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream
2024-09-29 11:06:09 +02:00
3426ea2912
Add preview of followers removed in domain block modal in web UI ( #32032 )
2024-09-25 18:13:36 +00:00
633165ba9c
Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream
2024-09-25 17:41:37 +02:00
3dc4ddc663
Fix search params being dropped when redirected to non-deck path ( #31984 )
2024-09-25 13:35:37 +00:00
c2c3a66478
Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream
2024-09-23 20:24:18 +02:00
aaab6b7adc
Add reblogs and favourites counts to statuses in ActivityPub ( #32007 )
2024-09-23 13:14:15 +00:00
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
bdf83c353f
Move default embed size knowledge into `OEmbedSerializer` ( #31990 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-09-20 12:39:48 +00:00
c922af2737
Add `LIMIT` constant for `api/v1/peers/search` endpoint ( #31989 )
2024-09-20 08:31:58 +00:00
5405bdd344
Remove unused E2EE messaging code ( #31193 )
2024-09-18 09:27:43 +00:00
a397141d78
Move non-action public method controller callback to private methods ( #31933 )
2024-09-18 08:05:25 +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
e0648a916a
Rename `/api/v2_alpha/notifications*` to `/api/v2/notifications*` ( #31840 )
2024-09-16 12:10:02 +00:00
83b553c7d1
Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream
2024-09-12 21:32:39 +02:00
f3c4874522
Remove unused `statuses#embed` body class assignment ( #31787 )
2024-09-12 13:38:15 +00:00
4aa600387e
Move redirect/base body class to view ( #31796 )
2024-09-12 13:31:50 +00:00
a496aeabcb
Change form-action Content-Security-Policy directive to be more restrictive ( #26897 )
2024-09-12 13:24:19 +00:00
10e2b87774
Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream
2024-09-12 12:09:21 +02:00
e0c27a5047
Add ability to manage which websites can credit you in link previews ( #31819 )
2024-09-10 12:00:40 +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
7335a43b6d
Use async count in admin dashboard ( #30606 )
2024-09-06 16:52:35 +00:00
0a433d08fb
Move shares/modal body class to layout ( #31789 )
2024-09-06 16:46:55 +00:00
4f81ad2494
Add coverage for `media#player`, move body class to view ( #31790 )
2024-09-06 16:46:25 +00:00
c88ba523ee
Fix sort order of moderation notes on Reports and Accounts ( #31528 )
2024-09-06 14:58:36 +00:00
a9d0b48b65
Set "admin" body class from `admin` nested layout ( #31269 )
2024-09-06 13:58:46 +00:00
7efe0bde9d
Add `have_http_link_header` matcher and set header values as strings ( #31010 )
2024-09-05 20:05: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
1fcffa573c
Fix 500 error in `GET /api/v2_alpha/notifications` when there are no notifications to return ( #31746 )
2024-09-04 12:54:15 +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
ea0d691e19
Add `GET /api/v2_alpha/notifications/:group_key/accounts` ( #31725 )
2024-09-03 14:32:26 +00:00
402c1e116d
Merge commit '491033c86cc9c29302bfe68cc94dabad82ded4cc' into glitch-soc/merge-upstream
2024-09-02 17:43:10 +02: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
Claire