mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,749 Commits
69 Branches
20 Tags
383 MiB
Commit Graph

1332 Commits (main)

Author SHA1 Message Date
Claire 6374937147 Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream added a date restriction to trendable posts, while glitch-soc had
  slightly different conditions.
  Added the date restriction to glitch-soc's conditions.
 2024-11-24 16:46:28 +01:00
Andrew W. Lee 3e44dca0b4
Change dependency from annotate to annotaterb (#30232) 2024-11-18 14:40:02 +00:00
Matt Jankowski c0c34d35e2
Move self destruct check to `config_for` and add constant for verifier string (#32943) 2024-11-18 09:57:16 +00:00
Eugen Rochko 911d7dbbf6
Fix `min_id` and `max_id` causing error in search API (#32857) 2024-11-18 09:37:01 +00:00
Renaud Chaput bcf5d30e01
Add OpenTelemetry VCS attributes (#32904) 2024-11-18 08:41:09 +00:00
Claire 4f1242964b Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream 2024-11-15 18:44:32 +01:00
Claire f1ef7b5b43
Fix uploading higher-than-wide GIF profile picture with libvips enabled (#32911) 2024-11-15 15:35:30 +00:00
Matt Jankowski 62d65504f6
Add `DomainResource` class to wrap MX lookup/normalize (#32864) 2024-11-14 13:47:29 +00:00
Matt Jankowski a6d829e86f
Fix error in CLI EmailDomainBlocks when supplying `--with-dns-records` (#32863) 2024-11-13 08:39:58 +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
Matt Jankowski 697947116e
Add `EmailDomainBlock.parents` scope (#31968) 2024-11-07 13:46:20 +00:00
Matt Jankowski e0a44b8317
Use `shell.indent` for list output indentation in CLI area (#31969) 2024-11-07 10:34:13 +00:00
Matt Jankowski 68b545ef33
Add `Status.not_direct_visibility` scope (#32065) 2024-11-07 10:32:33 +00:00
Claire befb44a08c
Fix “uninitialized constant HttpLog” errors in tootctl (#32796) 2024-11-07 09:57:42 +00:00
Claire dfccd207bb
Refactor common checks in `tootctl media remove-orphans` (#32720) 2024-11-04 09:04:55 +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
Claire 4d9b4ef72f Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream 2024-10-14 19:46:52 +02:00
Claire ffa1032381
Add further warnings about encryption secrets (#32476) 2024-10-14 13:00:20 +00:00
Claire bb0cf04d71
Add note about not changing ActiveRecord encryption secrets once they are set (#32413) 2024-10-11 09:19:48 +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
Matt Jankowski 3cf2d35c49
Reference `IpBlock.severities` keys from CLI option check (#32291) 2024-10-08 13:23:30 +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 cf28104317
Rename preloaded models constant in cli media (#30531) 2024-10-04 08:30:08 +00:00
Matt Jankowski 82e7d53d54
Rename transformer constant in sanitizer (#30532) 2024-10-04 08:29:23 +00:00
Matt Jankowski 52afa94f1c
Use `print_table` to wrap storage output CLI (#32230) 2024-10-03 12:13:54 +00:00
Emelia Smith c5f0da98e4
Add detection and download of material_symbol icons in config/navigation.rb (#31366) 2024-10-01 12:49:04 +00:00
Renaud Chaput 497e8d00b9
Bump `main` version 4.4.0-alpha.1 (#32180) 2024-10-01 08:36:22 +00:00
Claire 9af9ef6fb3 Merge commit '03210085b7481568cc507f088144aaf1dae73c88' into glitch-soc/merge-upstream 2024-09-30 13:04:19 +02:00
Claire 03210085b7
Bump version to 4.3.0-rc.1 (#32124) 2024-09-30 10:42:59 +00:00
Claire 7ef25ae53b Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream 2024-09-29 11:06:09 +02:00
Claire 886baa5e35
Fix typo causing incorrect error being raised in blurhash processing failure (#32104) 2024-09-26 07:40:59 +00:00
Claire 6de18bb475 Merge commit '3e91c101b3c4b5166dab778837e38bed424b4333' into glitch-soc/merge-upstream 2024-09-17 17:54:00 +02:00
Claire 3e91c101b3
Bump version to 4.3.0-beta.2 (#31948) 2024-09-17 15:42:45 +00:00
Claire 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
Claire e0648a916a
Rename `/api/v2_alpha/notifications*` to `/api/v2/notifications*` (#31840) 2024-09-16 12:10:02 +00:00
Claire 83b553c7d1 Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream 2024-09-12 21:32:39 +02:00
Taylor Chaparro 1b6a82b799
Fix invalid date searches returning 503 (#31526) 2024-09-12 13:40:20 +00:00
Claire 10e2b87774 Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream 2024-09-12 12:09:21 +02:00
Matt Jankowski c4b09d684e
Extract method for account-referencing in CLI prune task (#31824) 2024-09-10 13:23:55 +00:00
Claire 441af2632d Merge commit '2caa3f365ded73be17b623177967110e66f14061' into glitch-soc/merge-upstream 2024-09-09 18:22:41 +02:00
Mike Dalessio 10143d053a
Change some instances of Nokogiri HTML4 parsing to HTML5 (#31812) 2024-09-08 18:41:37 +00:00
Claire 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
Matt Jankowski be77a1098b
Extract `Account::AUTOMATED_ACTOR_TYPES` for "bot" actor_type values (#31772) 2024-09-06 07:49:38 +00:00
Claire 1a0ef0c526 Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream 2024-09-05 20:36:25 +02:00
David Roetzel f85694acfd
Add credentials to redis sentinel configuration (#31768) 2024-09-05 14:06:58 +00:00
David Roetzel 7d91723f05
Support `REDIS_SENTINEL_PORT` variables (#31767) 2024-09-05 09:26:49 +00:00