Claire
4f1242964b
Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream
2024-11-15 18:44:32 +01:00
Matt Jankowski
62d65504f6
Add DomainResource class to wrap MX lookup/normalize ( #32864 )
2024-11-14 13:47:29 +00:00
Claire
f5f6273d2b
Move ALLOWED_PRIVATE_ADDRESSES parsing to an initializer ( #32850 )
2024-11-12 13:00:52 +00:00
Matt Jankowski
5d9dde3ec0
Add age/expiry duration constants to BulkImport class ( #32839 )
2024-11-12 08:57:06 +00:00
Matt Jankowski
ea6d3ca8c1
Define constants for sampling sizes in AccountReachFinder ( #32805 )
2024-11-12 08:38:08 +00:00
Claire
f0f807cec7
Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream
2024-11-10 13:18:43 +01:00
Matt Jankowski
bde0f1239a
Add InetContainer with scopes of containing and contained ( #32802 )
2024-11-08 10:08:36 +00:00
Matt Jankowski
41227aeb95
Update Rails to version 7.2.2 ( #30391 )
2024-11-07 14:58:20 +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
Eugen Rochko
c2b498a2b0
Fix IDs not being serialized as strings in annual reports API ( #32710 )
2024-10-31 09:38:00 +00:00
David Roetzel
9de3fd60a0
Add telemetry for status / bio formatting ( #32677 )
2024-10-29 10:10:17 +00:00
Hugo Gameiro
b1d3c64525
Fix and improve batch attachment deletion handling when using OpenStack Swift ( #32637 )
2024-10-28 13:32:56 +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
35f008aa2a
Move translation service config to config_for yml ( #30663 )
2024-10-23 13:32:18 +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
kenkiku1021
f2378aca40
add SWIFT object storage uri to CSP media hosts ( #32439 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-10-15 09:28:07 +00:00
Claire
4d9b4ef72f
Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream
2024-10-14 19:46:52 +02: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
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
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
Jeong Arm
66b2bc1c84
Ignore error if mentioned account was not processable ( #29215 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-10-02 08:08:02 +00:00
Claire
7ef25ae53b
Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream
2024-09-29 11:06:09 +02:00
Claire
513f187daf
Add “A Mastodon update is available.” message on admin dashboard for non-bugfix updates ( #32106 )
2024-09-26 19:27:57 +00:00
Claire
633165ba9c
Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream
2024-09-25 17:41:37 +02:00
Renaud Chaput
3dc4ddc663
Fix search params being dropped when redirected to non-deck path ( #31984 )
2024-09-25 13:35:37 +00:00
Claire
c6039f99ce
Merge commit '70988519df66f0b8edeb6ca95140f1d3e436fea8' into glitch-soc/merge-upstream
2024-09-24 19:34:30 +02:00
André Menrath
556837f156
Fix the summary of converted object types to be treated as HTML ( #28629 )
2024-09-24 15:57:53 +00:00
Claire
c2c3a66478
Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream
2024-09-23 20:24:18 +02:00
Eugen Rochko
aaab6b7adc
Add reblogs and favourites counts to statuses in ActivityPub ( #32007 )
2024-09-23 13:14:15 +00:00
Claire
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
Claire
7ed9c590b9
Fix issue when encountering reblog of deleted post in feed rebuild ( #32001 )
2024-09-20 14:58:06 +00:00
Claire
8afa3bb2fa
Change Mastodon to issue correctly-signed queries by default ( #31994 )
2024-09-20 10:10:09 +00:00
Matt Jankowski
5405bdd344
Remove unused E2EE messaging code ( #31193 )
2024-09-18 09:27:43 +00:00
Claire
83b553c7d1
Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream
2024-09-12 21:32:39 +02:00
Claire
3465d39494
Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Upstream removed a helper, textually adjacent to a glitch-soc-only one.
Not really a conflict.
Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
Conflicts due to theming system.
Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
Removed upstream, but we had local changes.
Removed as upstream did.
2024-09-12 20:05:08 +02:00
Taylor Chaparro
1b6a82b799
Fix invalid date searches returning 503 ( #31526 )
2024-09-12 13:40:20 +00:00
Claire
a496aeabcb
Change form-action Content-Security-Policy directive to be more restrictive ( #26897 )
2024-09-12 13:24:19 +00:00
Claire
c35ea59ee6
Fix security context sometimes not being added in LD-Signed activities ( #31871 )
2024-09-12 12:58:12 +00:00
David Roetzel
ab763c493f
Ignore undefined as canonical url ( #31882 )
2024-09-12 11:14:42 +00:00
Claire
10e2b87774
Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream
2024-09-12 12:09:21 +02:00
Matt Jankowski
da07adfe6c
Add CustomEmoji.enabled scope ( #31830 )
2024-09-10 13:21:40 +00:00
Claire
441af2632d
Merge commit '2caa3f365ded73be17b623177967110e66f14061' into glitch-soc/merge-upstream
2024-09-09 18:22:41 +02:00
Mike Dalessio
a0ea2fa3b0
Change fetch link card service to parse as HTML5 ( #31814 )
2024-09-09 10:59:42 +00:00
Mike Dalessio
10143d053a
Change some instances of Nokogiri HTML4 parsing to HTML5 ( #31812 )
2024-09-08 18:41:37 +00:00
Claire
1a0ef0c526
Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream
2024-09-05 20:36:25 +02:00
