1
0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-02-22 02:23:48 -05:00

847 Commits

Author SHA1 Message Date
Claire
f3bc50778b Merge commit 'f1d4be1e7509f795706ff2310c5fc36e0e79bf4d' into glitch-soc/merge-upstream 2025-02-18 20:38:57 +01:00
Matt Jankowski
f1d4be1e75
Use preferred allowed origin configuration style for webauthn config () 2025-02-18 15:03:43 +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
Renaud Chaput
4af91e564d
Fix a missing require when enabling the local prometheus exporter with Sidekiq () 2025-02-05 13:49:47 +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
Renaud Chaput
59384282ed
Add an optional metric exporter () 2025-01-27 12:52:30 +00:00
Claire
155dc4bc4b Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream
Conflicts:
- `CONTRIBUTING.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `README.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `app/helpers/application_helper.rb`:
  Upstream added helpers where glitch-soc had extra ones.
  Added upstream's new helpers.
- `app/models/form/admin_settings.rb`:
  Upstream added some custom handling of one setting, while
  glitch-soc had additional code.
  Ported upstream's code.
- `lib/mastodon/version.rb`:
  Upstream moved some things to `config/mastodon.yml`.
  Did the same.
- `spec/requests/api/v1/accounts/credentials_spec.rb`:
  I don't know honestly.
2025-01-10 20:41:36 +01:00
Matt Jankowski
c0264c8013
Extend custom CSS cache time with digest paths () 2025-01-08 08:48:45 +00:00
Claire
163a8569ed Merge commit '9b82bedc6f589b19c1cf9dc8f566f4c19702d965' into glitch-soc/merge-upstream 2025-01-04 18:55:35 +01:00
Matt Jankowski
9b82bedc6f
Only register stats dirs when command available () 2025-01-04 17:44:49 +00:00
Claire
807bf8be24 Merge commit '9712518b2fb2585df3bcff95a687c291f04a4199' into glitch-soc/merge-upstream 2025-01-04 15:27:49 +01:00
Matt Jankowski
af7d6e59af
Replace deprecated STATS_DIRECTORIES with Rails::CodeStatistics.register_directory approach () 2025-01-03 21:52:16 +00:00
Claire
7e1f8babbd Merge commit '7d6da219c0fccb8693282a99765135050173d7c4' into glitch-soc/merge-upstream 2025-01-03 20:26:28 +01:00
Matt Jankowski
535866218e
Update rails to version 8.0.1 () 2025-01-03 16:08:21 +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
22813dbc6e
Fix /health endpoint when OTEL is configured () 2024-12-19 10:44:44 +00:00
Renaud Chaput
3febe7d020
Add OTEL trace & span IDs to logs () 2024-12-18 07:34:20 +00:00
Robb Kidd
d580607510
don't start OTel traces with Redis spans () 2024-12-13 08:21:38 +00:00
Claire
f740611820 Merge commit 'd0753ec276502ea28a1e853cbc6487020a0602e3' into glitch-soc/merge-upstream 2024-11-24 18:56:15 +01:00
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
Matt Jankowski
be2d4615ab
Rely on Rails to enable YJIT when available () 2024-11-22 08:31:23 +00:00
Emelia Smith
4517e18b79
Update dependency doorkeeper to v5.8.0 ()
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-21 13:48:30 +00:00
Renaud Chaput
bcf5d30e01
Add OpenTelemetry VCS attributes () 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
f5f6273d2b
Move ALLOWED_PRIVATE_ADDRESSES parsing to an initializer () 2024-11-12 13:00:52 +00:00
Claire
f0f807cec7 Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream 2024-11-10 13:18:43 +01:00
David Roetzel
d60ef3f17e
Disable httplog gem in production () 2024-11-05 08:55:34 +00:00
Matt Jankowski
a139dac18e
Remove cookie rotator () 2024-11-04 09:11:00 +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
Emelia Smith
e1b7382ea6
Add userinfo oauth endpoint () 2024-10-30 14:38:10 +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
Claire
6ff1954bdb
Change Active Record Encryption variable check to check for emptiness () 2024-10-16 08:43:45 +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 () 2024-10-14 13:00:20 +00:00
Claire
c574f5b53f
Change how migrations duplicated between glitch and upstream are handled () 2024-10-09 18:36:19 +02: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
Emelia Smith
454d21ab5a
Remove OAuth Password Grant Type support () 2024-10-01 09:56:58 +00:00
Claire
9af9ef6fb3 Merge commit '03210085b7481568cc507f088144aaf1dae73c88' into glitch-soc/merge-upstream 2024-09-30 13:04:19 +02:00
Claire
e22eff8900
Remove regexp timeout feature () 2024-09-30 09:41:06 +00:00
Claire
c6039f99ce Merge commit '70988519df66f0b8edeb6ca95140f1d3e436fea8' into glitch-soc/merge-upstream 2024-09-24 19:34:30 +02:00
David Roetzel
cfb8fc6222
Increase regexp timeout and allow override () 2024-09-24 13:16:58 +00:00
Claire
c2c3a66478 Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream 2024-09-23 20:24:18 +02:00
Tim Campbell
11eae691ba
Feature more otel customization () 2024-09-23 08:55:35 +00:00
Claire
221bba1897 Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream 2024-09-21 15:06:06 +02:00
Matt Jankowski
5405bdd344
Remove unused E2EE messaging code () 2024-09-18 09:27:43 +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
d5cf27e667
Add global Regexp timeout () 2024-09-16 09:40:18 +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
Claire
a496aeabcb
Change form-action Content-Security-Policy directive to be more restrictive () 2024-09-12 13:24:19 +00:00