Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-14 00:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,205 Commits 74 Branches 58 Tags
8b418b84d0d022823e7fc23b385aef35c456875f
Commit Graph

310 Commits

Author SHA1 Message Date
Claire
ee88f8550c Merge commit '0219b7cad7d9ef800f82cc561571b70da040433f' into glitch-soc/merge-upstream 2025-10-10 19:01:35 +02:00
Claire
0219b7cad7 Add result_count to Mastodon-Async-Refresh header when needed (#36239) 2025-10-10 12:26:10 +00:00
Claire
b6c53c1129 Merge commit '150f0fcba5585782e2cac49d971904f02d5e6fbd' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
  Upstream refactored a part of the code where glitch-soc has changed the code
  to potentially hide followers count.
  Adapt upstream's changes.
 2025-09-29 18:41:46 +02:00
Claire
150f0fcba5 Add support for numeric-based URIs for local accounts (#32724) 2025-09-29 12:05:48 +00:00
Claire
b15b07606c Merge commit '28be5a199f685b9fb26742c4d78ddca53df05d57' into glitch-soc/merge-upstream 2025-09-24 18:26:13 +02:00
Claire
e1f7847b64 Remove the outgoing_quotes feature flag, making the feature unconditional (#36130) 2025-09-24 08:58:08 +00:00
Claire
16e479e3ec Merge commit '90765342a35abd6883e57f5419342f491b83e250' into glitch-soc/merge-upstream 2025-09-17 21:46:08 +02:00
Claire
90765342a3 Fix posts when omitting quote policy and default policy is nobody (#36158) 2025-09-17 19:16:36 +00:00
Claire
210786efd8 Merge commit '2664bb628b7bf77b9efa4143423486cf16d17ba7' into glitch-soc/merge-upstream 2025-09-17 18:17:18 +02:00
Jeong Arm
3055afd1d2 Fix applying user's default quote policy if API parameter is not specified (#36132) 2025-09-17 07:08:55 +00:00
Claire
26193a119b Merge commit 'd9b70bbde13b78709b48be6c979bc7520e81520a' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper close to a glitch-soc one.
  Added upstream's helper.
 2025-09-16 18:30:30 +02:00
Claire
6c5a4702d9 Use default quote policy setting in the absence of API parameter (#36094) 2025-09-15 15:53:21 +00:00
Claire
4d9150735a Merge commit '651e51a82eba542c4d8c3fec5edd16420ea1ff3e' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated a dependency textually adjacent to a glitch-soc-specific one.
  Updated the dependency as upstream did.
 2025-08-17 20:52:34 +02:00
Claire
2648bbdc51 Add PUT /api/v1/statuses/:status_id/interaction_policy (#35769) 2025-08-13 15:51:16 +00:00
Matt Jankowski
5ee83a680b Update stoplight to version 5.3.1 (#35129) 2025-08-12 08:15:22 +00:00
Claire
63af7ecb1f Merge commit '7d3ef27a8dc8fb281bae959b245d3db63aa82260' into glitch-soc/merge-upstream 2025-07-23 18:43:56 +02:00
Matt Jankowski
b19131202f Extract constants for captcha directives/sources (#35439) 2025-07-23 07:55:54 +00:00
Claire
3efc857fbc Merge commit '8ee6cee36e313fcc39763210dfcd3b871b47cacb' into glitch-soc/merge-upstream 2025-07-08 16:41:01 +02:00
David Roetzel
8ee6cee36e Better error response to malformed headers (#35278) 2025-07-08 09:31:04 +00:00
Claire
68b05e994f Fix error on log-in from old users requiring ToS interstitial when said ToS has been removed (#35233) 2025-07-01 17:43:59 +00:00
Claire
f8f458e5e6 Merge commit '0ec6c26af3d7dc9a0eeb5631ebb9f56b724aaa8e' into glitch-soc/merge-upstream 2025-06-20 12:01:02 +02:00
David Roetzel
0ec6c26af3 Fix error when RFC9421 signatures are used (#35109) 2025-06-20 09:44:26 +00:00
Claire
7da6b07c75 Merge commit '71d4ce1c228bab470fa9d3bcb5a130cf53665103' into glitch-soc/merge-upstream 2025-06-13 18:07:59 +02:00
David Roetzel
83d5016ca3 Re-instate rescuing signature errors (#35033) 2025-06-13 13:36:33 +00:00
Claire
80af1ea434 Merge commit '825312d4b0587c0da5575f8eaabe038438746cd3' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict because of different theming system.
  Adapted upstream's changes.
- `vite.config.mts`:
  Conflict because of different theming system.
  Adapted upstream's changes.
 2025-06-12 20:32:25 +02:00
David Roetzel
319fbbbfac Experimental Async Refreshes API (#34918) 2025-06-12 14:54:00 +00:00
Claire
088af860b3 Merge commit '9c80b16401e7606cbd7eb2bf3af32c18953d1d3f' into glitch-soc/merge-upstream 2025-06-02 12:16:06 +02:00
David Roetzel
9c80b16401 Accept HTTP Message Signatures (RFC9421) (#34814) 2025-06-02 09:27:08 +00:00
Claire
f622686397 Merge commit '90f7b90223ce3212a2bb9746a119bcc9287b3237' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated dependencies, including one textually adjacent to a
  glitch-soc-only dependency.
  Updated dependencies as upstream did.
 2025-05-25 14:38:25 +02:00
Claire
f49940db85 Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream 
Too many conflicts to list, because of webpack → vite migration.
 2025-05-25 14:36:51 +02:00
Claire
8cc5084ca1 Add interstitial for Terms of Service updates (#34527) 2025-05-16 14:03:05 +00:00
Claire
dae6f19490 Merge commit '7a70d9543525681b5c408cfd17782843da13177f' into glitch-soc/merge-upstream 2025-04-25 17:22:10 +02:00
Claire
22ec828951 Change DEFAULT_LOCALE to not override unauthenticated users' browser language (#34535) 2025-04-24 11:38:27 +00:00
Claire
99e3ea232f Merge commit '5f87ae101c5e0e940e148d493eaac1ce31fe24c1' into glitch-soc/merge-upstream 2025-04-04 20:00:24 +02:00
David Roetzel
e2ef173b82 Refactoring: Move SignatureVerificationError into Mastodon namespace (#34342) 2025-04-02 07:54:29 +00:00
Claire
745c445e7e Merge commit 'e1dbbf6c9db6dbf3f356dae4c59fa05299372370' into glitch-soc/merge-upstream 2025-03-25 19:59:59 +01:00
Claire
38f5e74122 Add Deprecation headers on deprecated endpoints (#34262) 
Co-authored-by: Damien Mathieu <42@dmathieu.com>
 2025-03-25 12:30:10 +00:00
Claire
28d85ede4c Merge commit '4fc8c6912979e8fd7882fb360b77e677ffd68565' into glitch-soc/merge-upstream 2025-02-12 18:40:21 +01:00
Claire
db59f37269 Fix redirect after log-in when allow_referrer_origin setting is enabled (#33903) 2025-02-12 12:58:48 +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
Matt Jankowski
93f3c724ae Use expect in remaining controller locations (#33748) 2025-01-27 16:32:06 +00:00
Matt Jankowski
d3b637c757 Use expect in Admin::ExportControllerConcern import params (#33745) 2025-01-27 14:29:25 +00:00
Claire
126ce9a232 Merge commit '82d2ce293d98a2b9e024bc5396c3586904d46ae5' into glitch-soc/merge-upstream 2025-01-06 20:36:25 +01:00
Claire
ea9b10d112 Fix error 500 when passing an invalid lang parameter (#33467) 2025-01-06 10:16:42 +00:00
Claire
0aa69487a2 Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `config/routes.rb`:
  Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
  an extra route.
  Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
  This spec got converted to a system spec upstream.
  However, the theme setting works differently in glitch-soc, so the spec had been
  changed.
  Changed the corresponding system spec as well.
 2024-12-25 18:01:37 +01:00
Renaud Chaput
2a369a8977 Use a system setting for the Referer policy (#33239) 2024-12-10 13:16:52 +00:00
Claire
48827e1210 Merge commit 'a27bafa59653328a0f06bedb1dfb2b6ee92af43d' into glitch-soc/merge-upstream 
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `spec/helpers/application_helper_spec.rb`:
  Minor conflict due to glitch-soc's theming system.
 2024-12-01 17:36:49 +01:00
Matt Jankowski
6efa320feb Fix Style/SafeNavigation cop (#32970) 2024-11-26 08:09:04 +00:00