Noa Himesaka
ce801c6e63
Merge branch 'glitch-soc:main' into main
2024-11-19 20:05:03 +09:00
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
Noa Himesaka
8f563dd680
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-11-11 13:44:26 +09: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
Noa Himesaka
d45671066c
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-10-17 00:30:51 +09: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
Noa Himesaka
0e5dd35e84
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-10-08 23:58:28 +09: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
Noa Himesaka
67c1a405ad
Merge branch 'pr2462'
2024-10-01 17:19:04 +09:00
Essem
f8a38731c3
Fix reblog reactions being hydrated improperly
2024-09-30 20:29:22 -05:00
Essem
d0307e6d52
Turn custom emoji regexps into class level constants
2024-09-30 20:28:42 -05:00
Essem
7cb1921ae7
Hydrate reactions on streaming API
2024-09-30 20:28:01 -05:00
Essem
73e334f611
Make name of like content parser function more general
2024-09-30 20:27:59 -05:00
Essem
cf8ec7193b
Check for content attribute in Misskey likes
2024-09-30 20:27:59 -05:00
Essem
0fe45d5fef
Add support for emoji reactions
...
Squashed, modified, and rebased from glitch-soc/mastodon#2221 .
Co-authored-by: fef <owo@fef.moe>
Co-authored-by: Jeremy Kescher <jeremy@kescher.at>
Co-authored-by: neatchee <neatchee@gmail.com>
Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com>
Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2024-09-30 20:27:58 -05:00
Claire
7ef25ae53b
Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream
2024-09-29 11:06:09 +02:00
Noa Himesaka
262ddc00f4
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-09-28 23:23:16 +09: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
