Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
28,482 Commits 75 Branches 73 Tags
main
Commit Graph

944 Commits

Author SHA1 Message Date
Claire
00b56932de Fix handling of featured tag removal (#34887) 2025-06-02 08:09:30 +00:00
Claire
8e409f92fe Merge commit '32b521b7f4055ccd4e59587589c2bed7759537cb' into glitch-soc/merge-upstream 2025-05-31 17:32:57 +02:00
Claire
32b521b7f4 Fix multiple issues in quoted posts hydration (#34864) 2025-05-31 15:20:31 +00:00
Claire
086a7016c4 Merge commit 'd78535eab9cefc285c0d7ef88adb125ab1ceb6bd' into glitch-soc/merge-upstream 
Conflicts:
- `vite.config.mts`:
  Upstream moved its theming system to a plug-in, where we had our own.
  Adapted the file as well as our own plugin to adopt the same mechanisms.
 2025-05-27 20:49:19 +02:00
Matt Jankowski
37c82a3003 Update sidekiq to version 7 (#34745) 2025-05-26 15:32:41 +00:00
Claire
b031f65670 Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream 2025-05-25 14:51:59 +02:00
Claire
6d6263ce07 Drop redis namespace code (except for Rails cache) (#34665) 2025-05-20 13:02:09 +00:00
Claire
5321a553d5 Merge commit 'aa04efb92a47cf27c1aafb2aeb21584e91c526ac' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Not a real conflict, upstream added a setting on a line adjacent to a
  glitch-soc-only line.
  Added upstream's new setting.
 2025-05-14 13:38:23 +02:00
Claire
4e2aa78a56 Fix tootctl accounts create failing because of date-of-birth check (#34663) 2025-05-12 09:28:12 +00:00
Claire
8d98d91f33 Merge commit '22e2e7f02b2f25f30abd6a616bc3b0b543b30279' into glitch-soc/merge-upstream 2025-05-06 12:06:51 +02:00
Claire
22e2e7f02b Fix crash when likes or shares collections are not inlined, for real (#34619) 2025-05-06 09:51:42 +00:00
Claire
3e5d78cc5b Fix crash when likes or shares collections are not inlined (#34618) 2025-05-06 07:39:26 +00:00
Claire
3ec3814f8e Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream 2025-05-03 17:37:26 +02:00
Eugen Rochko
715cbee93d Fix dashboard warning about Elasticsearch index mismatch not showing up (#34567) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-04-28 13:59:49 +00:00
Claire
9ed6a14d45 Add support for ingesting quote policies (#34479) 2025-04-28 08:48:27 +00:00
Claire
ae3b7dd28d Reject incoming QuoteRequest activities (#34480) 2025-04-25 23:28:09 +00:00
Claire
dae6f19490 Merge commit '7a70d9543525681b5c408cfd17782843da13177f' into glitch-soc/merge-upstream 2025-04-25 17:22:10 +02:00
Matt Jankowski
6463415e06 Update rubocop-rspec to version 3.6.0 (#34497) 2025-04-24 14:56:13 +00:00
Claire
3628717595 Merge commit '3159f3b2f6ed444d4f247c5e7864e4c41ca285df' into glitch-soc/merge-upstream 2025-04-21 15:47:21 +02:00
Claire
ace0a3d61f Merge commit 'b33f9ea60338a78dde2fb7fe3f083c2ffaafcf1f' into glitch-soc/merge-upstream 2025-04-21 15:22:22 +02:00
Claire
8489f6c8fc Fix namespace of QuoteAuthorization type in specs (#34481) 2025-04-17 09:19:23 +00:00
Claire
df2611a10f Add initial support for ingesting and verifying remote quote posts (#34370) 2025-04-17 07:45:23 +00:00
Claire
99e3ea232f Merge commit '5f87ae101c5e0e940e148d493eaac1ce31fe24c1' into glitch-soc/merge-upstream 2025-04-04 20:00:24 +02:00
Claire
dd23ba9c83 Refactor local-URI-to-account resolving (#34349) 2025-04-02 14:44:09 +00:00
David Roetzel
e2ef173b82 Refactoring: Move SignatureVerificationError into Mastodon namespace (#34342) 2025-04-02 07:54:29 +00:00
Claire
f8b0f38636 Merge commit '902aab1245a06319b7acd20045bd9ce051627300' into glitch-soc/merge-upstream 2025-03-29 17:02:39 +01:00
Claire
a5eaa95bb2 Merge commit 'e28b64ac2dcd381f8b7e6bcfc2cc2b2ed3121cd9' into glitch-soc/merge-upstream 2025-03-28 18:48:04 +01:00
David Roetzel
97b9994743 Basic FASP support (#34031) 2025-03-28 12:16:40 +00:00
Claire
c2defe0e4c Change account suspensions to be federated to recently-followed accounts as well (#34294) 2025-03-28 09:20:32 +00:00
Claire
0efa669fe9 Merge commit '2f98134ac69ee840095c9d8389e4b2fff72f20c1' into glitch-soc/merge-upstream 2025-03-15 17:49:32 +01:00
David Roetzel
4a6cf67c46 Add middleware to record queue time (#34172) 2025-03-14 13:52:04 +00:00
Claire
399fbf97de Merge commit '420ffdfb6259740602d4ce727ed5c60432c776a5' into glitch-soc/merge-upstream 2025-03-11 18:44:32 +01:00
David Roetzel
bedf808e02 Move feature flag test setup into config (#34124) 2025-03-11 13:29:17 +00:00
Claire
dbd3e05812 Merge commit 'b57687083f4af178f2e2f43665eb4e49d32a50c2' into glitch-soc/merge-upstream 2025-03-07 17:37:36 +01:00
David Roetzel
8cf27d0fbb Add simple feature flag system (#34038) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-05 15:41:54 +00:00
Claire
28d85ede4c Merge commit '4fc8c6912979e8fd7882fb360b77e677ffd68565' into glitch-soc/merge-upstream 2025-02-12 18:40:21 +01:00
Claire
1248c4d1f4 Fix handling of duplicate mentions in incoming status Update (#33911) 2025-02-12 15:34:56 +00:00
Claire
6ab5b9c790 Merge commit 'a9643cb7e77fd345b48877ed958d406403ad1b46' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-nightly.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
- `.github/workflows/build-push-pr.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
- `.github/workflows/build-releases.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
- `.github/workflows/build-security.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
 2025-02-05 18:21:36 +01:00
Claire
334d306ccc Fix filtering for lists (#33842) 2025-02-05 15:08:12 +00:00
Claire
353e5f797c Merge commit '5b291fcbe41564264954618fb1f4086a3be1c600' into glitch-soc/merge-upstream 
Conflicts:
- `app/validators/poll_options_validator.rb`:
  Upstream split `PollValidator` in two, and glitch-soc had local changes to
  make the options configurable.
  Refactored as upstream did, keeping glitch-soc's configurable limits.
 2025-01-28 18:29:46 +01:00
Claire
5b291fcbe4 Fix incorrect signature after HTTP redirect (#33757) 2025-01-28 14:44:27 +00:00
Claire
fcc5262f60 Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream 
Conflicts:
- `spec/system/settings/preferences/appearance_spec.rb`:
  Upstream tests for changing themes in there, but glitch-soc has
  its own place for that.
  Updated upstream's change while skipping the theme test.
 2025-01-27 18:19:09 +01:00
Claire
7261951791 Fix LDSignature tests (#33705) 2025-01-23 17:56:33 +00:00
Claire
19fa4cfcf2 Merge commit '3178acc5cb8415a72b646dbe77be05255d3966f3' into glitch-soc/merge-upstream 2025-01-23 13:38:23 +01:00
Jonathan de Jong
b18caff5b6 Change first_of_value to first_of_hash, and add more test cases (#33647) 2025-01-22 14:02:05 +00:00
Claire
297eb7c956 Merge commit '4bd969e4bb54297981d385903bf8a4348b394f09' into glitch-soc/merge-upstream 
Conflicts:
- `CONTRIBUTING.md`:
  Upstream modified it while we quote upstream's within an otherwise different file.
  Applied upstream's changes.
 2025-01-18 12:42:17 +01:00
Matt Jankowski
3af6739f21 Add coverage for AnnualReport.prepare method (#33618) 2025-01-16 15:45:48 +00:00
Claire
f6a0cd9d1a Merge commit 'da4e55eb17e459fbc6d1a19fac3303508324324c' into glitch-soc/merge-upstream 2025-01-16 11:16:53 +01:00
Claire
da4e55eb17 Merge commit from fork 2025-01-16 11:10:08 +01:00
Claire
ab152ebed4 Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/status.rb`:
  Upstream refactored `visibility` handling to a concern, while glitch-soc had
  custom code adjacent to some of the changed lines.
  Applied upstream's changes.
- `lib/mastodon/version.rb`:
  Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's
  default github repository had been modified.
  Applied upstream's changes and updated `config/mastodon.yml` accordingly.
 2025-01-14 20:38:32 +01:00