Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 07:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,248 Commits 74 Branches 58 Tags
main
Commit Graph

362 Commits

Author SHA1 Message Date
Claire
53617cef5a Merge commit 'd730f6b0c5cfb18894d1a9e34d0aa2556dda3c62' into glitch-soc/merge-upstream 2025-12-11 18:05:28 +01:00
Claire
da2b75bdcd Change build-releases workflow to tag images latest based on latest stable-x.y branch (#37179) 
Co-authored-by: emilweth <7402764+emilweth@users.noreply.github.com>
 2025-12-10 17:01:25 +00:00
Claire
99ff59b7b2 Merge commit '37ccffa95a30772b55e3f18d486d699ee6c5f9e8' into glitch-soc/merge-upstream 2025-11-30 17:47:27 +01:00
Echo
84ffb107c3 Adjust Chromatic to run conditionally (#37050) 2025-11-28 13:37:04 +00:00
Claire
152505dd9e Merge commit '6f1a30c4a6ea49ff7935f19f5a2cefab3eee9e7c' into glitch-soc/merge-upstream 2025-11-06 14:43:18 +01:00
Claire
6f1a30c4a6 Bump version to v4.5.0 (#36754) 2025-11-06 13:24:58 +00:00
Claire
a7ba4ba446 Merge commit '26e7fe97714d077930621f9111b7eaad2774df65' into glitch-soc/merge-upstream 2025-11-04 20:38:24 +01:00
renovate[bot]
e7692d0de8 chore(deps): update artifact actions (major) (major) (#36711) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-11-04 15:28:26 +00:00
renovate[bot]
cc77844540 chore(deps): update github/codeql-action action to v4 (#36713) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-11-04 15:28:17 +00:00
renovate[bot]
1a698d3b35 chore(deps): update chromaui/action action to v13 (#36712) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-11-04 14:29:19 +00:00
renovate[bot]
5a2edebc2b chore(deps): update actions/checkout action to v5 (#36709) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-11-04 14:25:48 +00:00
Claire
2575ff5ce2 Fix crowdin download script for glitch-soc stable branches (#3225) 2025-10-10 18:44:33 +02:00
Claire
880e662a60 Merge commit '854aaec6fe69df02e6d850cb90eef37032b4d72f' into glitch-soc/merge-upstream 2025-09-19 18:18:56 +02:00
David Roetzel
f316cd51c8 Enable GH actions scanning with CodeQL (#36193) 2025-09-19 13:14:24 +00:00
Claire
c893b82ace Remove unnecessary limitation on manual build-security workflow (#35752) 2025-08-13 07:12:11 +00:00
Claire
53185f5381 Merge commit '081d38679f965ac20ff1a6c72e2fc1108c34ac30' into glitch-soc/merge-upstream 2025-08-04 21:24:47 +02:00
renovate[bot]
bf46cffd9e Update peter-evans/create-pull-request action to v7.0.8 (#35648) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-04 06:48:16 +00:00
Claire
3efc857fbc Merge commit '8ee6cee36e313fcc39763210dfcd3b871b47cacb' into glitch-soc/merge-upstream 2025-07-08 16:41:01 +02:00
Claire
fdefc4d2b4 Add ability to manually trigger i18n uploads (#35279) 2025-07-07 09:22:22 +00:00
Claire
aa6d1d4ac1 Merge commit '629bb74451242060298c6fb305c5337002379cc2' into glitch-soc/merge-upstream 2025-06-11 18:55:03 +02:00
Matt Jankowski
629bb74451 Replace selenium-webdriver with playwright (#34867) 2025-06-10 16:33:46 +00:00
Claire
564d74ea36 Merge commit 'd887790e86124493df850e9bc52e1e059207b523' into glitch-soc/merge-upstream 2025-06-06 18:16:52 +02:00
Claire
ba75ba3adc Change github workflow for chromatic to only run on official Mastodon repository (#34963) 2025-06-06 12:57:41 +00:00
Claire
ac68d7e471 Merge commit 'b10fde673d4e703b53f43691419a6e91672daf9e' into glitch-soc/merge-upstream 
Conflicts:
- `tsconfig.json`:
  Upstream added config for storybook files, while glitch-soc had an addition
  for the glitch flavor on the last line.
  Added upstream's new config.
- `yarn.lock`:
  Upstream added a new dependency to an `eslint` plugin textually adjacent to
  a couple glitch-only-dependencies.
  Added upstream's new dependency.
 2025-06-06 13:32:20 +02:00
diondiondion
f2cfa4f482 feat: Add Storybook for component documentation, testing, and development (#34907) 
Co-authored-by: Echo <ChaosExAnima@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-06-06 09:27:29 +00:00
Claire
7f87ce2996 Merge commit '12c0e58d9aa80db570fba5fa5146f3a640e99b42' into glitch-soc/merge-upstream 2025-06-04 11:49:36 +02:00
Claire
12c0e58d9a Fix mastodon-streaming container image builds on 4.4 (#34921) 2025-06-04 09:36:15 +00:00
Claire
088af860b3 Merge commit '9c80b16401e7606cbd7eb2bf3af32c18953d1d3f' into glitch-soc/merge-upstream 2025-06-02 12:16:06 +02:00
Matt Jankowski
7f4ec7d9cf Include matrix values in upload artifact names (#34876) 2025-05-31 15:52:28 +00:00
Claire
b031f65670 Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream 2025-05-25 14:51:59 +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
f7182ddc8b Change libvips to be enabled by default (#34741) 2025-05-20 17:14:17 +00:00
Echo
c4f47adb49 Convert from Webpack to Vite (#34450) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-05-16 13:26:12 +00:00
Claire
5cade30257 Merge commit '8c579c5b34b94a9ca59f91d24ec23366f4d21137' into glitch-soc/merge-upstream 
Conflicts:
- `jest.config.js`
- `package.json`
- `tsconfig.json`
 2025-05-08 15:47:40 +02:00
Echo
8c579c5b34 Migrate from Jest to Vitest (#34454) 2025-05-07 18:29:02 +00:00
Claire
e0406fcf02 Merge commit 'e8270e2807727e1cf6a47a40442b3038c5bca858' into glitch-soc/merge-upstream 
Conflicts:
- `.eslintrc.js`:
  Upstream moved it to `eslint.config.mjs`.
  Ported the glitch-soc changes there.
- `yarn.lock`:
  Upstream updated dependencies close to glitch-soc-only dependencies.
  Ported upstream's changes.
 2025-04-01 20:59:34 +02:00
Echo
e8270e2807 Upgrade to ESLint v9 flat config (#34324) 
Co-authored-by: Nick Schonning <nschonni@gmail.com>
 2025-04-01 16:30:18 +00:00
Claire
4bea9a0a66 Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream 2025-03-07 18:34:27 +01:00
Claire
04492e7f93 Fix behavior of database schema loading with SKIP_POST_DEPLOYMENT_MIGRATIONS (#34089) 2025-03-07 13:41:16 +00:00
Jonathan de Jong
b155c62aa2 Dockerfile: prevent unnecessary ffmpeg building (#34084) 2025-03-07 08:46:04 +00:00
Claire
b6f3cfb302 Merge commit 'e5655a5f65eb8116640ae434125553e0fe77f35e' into glitch-soc/merge-upstream 2025-03-06 20:10:00 +01:00
Matt Jankowski
894b96cf1f Rely on haml-lint parallel default (#34036) 2025-02-28 14:33:15 +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
a9643cb7e7 Use github's native arm64 runners for docker builds (#33788) 2025-02-05 15:58:28 +00:00
Claire
1dbeac2196 Merge commit '3b1ba46c93de63268d20104dee63374d0708deb0' into glitch-soc/merge-upstream 2025-02-04 18:38:41 +01:00
Matt Jankowski
95caa8bc4e Switch coverage generation default to false, allow opt in with COVERAGE env var (#33824) 2025-02-04 11:14:45 +00:00
Claire
ad71a8d1f7 Merge commit 'c20824fa760061cf8fba258dbbd6b0a615df4749' into glitch-soc/merge-upstream 2025-01-15 19:32:04 +01:00
fusagiko / takayamaki
1ae574e32a Enable parallel execution for linting tasks in HAML workflows (#33593) 2025-01-15 07:48:26 +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
Nick Schonning
67a8d4638c Unpin peter-evans/create-pull-request to v7 (#30817) 2025-01-08 11:01:51 +00:00