tarrien/Mastodon

Go to file

Claire ef3d15554b Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream

Conflicts:
- `Gemfile.lock`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept glitch-soc's README.
- `app/models/account.rb`:
  Not a real conflict, upstream updated some lines textually adjacent
  to glitch-soc-specific lines.
  Ported upstream's changes.

2024-02-24 14:46:14 +01:00

Update libretranslate/libretranslate Docker tag to v1.5.5 (#29090 )

2024-02-06 09:38:32 +00:00

Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream

2024-02-24 14:46:14 +01:00

Use Yarn instead of NPX for pre-commit hook (#24287 )

2023-03-28 06:28:57 +02:00

Replace our custom compression-webpack-plugin patch with the fixed upstream version (#28510 )

2023-12-29 09:33:06 +00:00

Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream

2024-02-24 14:46:14 +01:00

Handle CLI failure exit status at the top-level script (#28322 )

2024-01-26 08:53:44 +00:00

helm: cleanup helm chart, now in mastodon/chart (#21801 )

2022-12-09 06:36:29 +01:00

Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream

2024-02-24 14:46:14 +01:00

Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream

2024-02-24 14:46:14 +01:00

Add suggestion for secure cyphers to nginx.conf (#26349 )

2023-08-31 12:17:10 +02:00

Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream

2024-02-24 14:46:14 +01:00

…

Merge commit 'c6684aa1e392f2dd86af4362b4259809549abaad' into glitch-soc/merge-upstream

2024-01-15 20:01:36 +01:00

Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream

2024-02-24 14:46:14 +01:00

Merge commit '805dba7f8d2a2d5f910ec1396247b36417170345' into glitch-soc/merge-upstream

2024-02-24 13:53:59 +01:00

…

.browserslistrc

…

.buildpacks

…

.bundler-audit.yml

Ignore the devise-two-factor advisory as we have rate limits in place (#28733 )

2024-01-15 10:45:48 +00:00

.dockerignore

Do not copy public/packs-test into Docker (#27736 )

2023-11-07 09:22:04 +00:00

.editorconfig

Enable EditorConfig trailing whitespace trimming (#23543 )

2023-02-12 08:34:17 +01:00

.env.production.sample

Add env variable support for number of followable hashtags in feed column (#2500 )

2024-02-06 20:23:36 +01:00

.env.test

Improve Babel configuration and automatically load polyfills (#27333 )

2023-10-31 10:55:13 +00:00

.env.vagrant

Add elastic search installation into Vagrantfile (#26512 )

2023-08-23 15:46:14 +02:00

.eslintignore

…

.eslintrc.js

Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer

2024-02-22 20:58:41 +01:00

.foreman

…

.gitattributes

…

.gitignore

Upgrade to Yarn 4, remove support for Node 16 (#27073 )

2023-11-08 10:57:21 +00:00

.gitmodules

…

.haml-lint_todo.yml

Fix LineLength haml-lint in media/player view (#28667 )

2024-01-10 09:35:01 +00:00

.haml-lint.yml

Update haml-lint line length configuration to match rubocop value (#27570 )

2023-10-31 09:47:16 +00:00

.nanoignore

…

.nvmrc

Update dependency node to 20.11 (#28670 )

2024-01-11 12:48:01 +00:00

.prettierignore

Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream

2024-01-13 12:11:29 +01:00

.prettierrc.js

Use Prettier for ESLint formatting TypeScript (#23631 )

2023-05-09 19:02:12 +02:00

.profile

Make it possible to upload audio and video to Heroku app (#24866 )

2023-05-05 14:41:07 +02:00

.rspec

…

.rubocop_todo.yml

Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream

2024-02-24 14:46:14 +01:00

.rubocop.yml

Use abort instead of warn(); exit in boot.rb env check (#29209 )

2024-02-16 14:29:24 +00:00

.ruby-gemset

…

.ruby-version

Use ruby version 3.2.3 (#28817 )

2024-01-22 11:55:51 +00:00

.simplecov

Disable simplecov enable_coverage_for_eval option, move to standalone file (#27869 )

2023-11-15 23:09:31 +00:00

.slugignore

…

.watchmanconfig

Fix Jest config (#27834 )

2023-11-13 12:19:41 +00:00

.yarnrc.yml

Upgrade to Yarn 4, remove support for Node 16 (#27073 )

2023-11-08 10:57:21 +00:00

app.json

Make enable_starttls configurable by envvars (#20321 )

2022-11-10 21:06:21 +01:00

Aptfile

Make it possible to upload audio and video to Heroku app (#24866 )

2023-05-05 14:41:07 +02:00

AUTHORS.md

Update AUTHORS.md (#27018 )

2023-09-21 14:42:15 +02:00

babel.config.js

Disable Babel polyfill injection in dev (#27691 )

2023-11-06 10:24:41 +00:00

CHANGELOG.md

Bump version to v4.3.0-alpha.3 (#29241 )

2024-02-16 12:17:15 +01:00

CODE_OF_CONDUCT.md

Update Contributor Covenant to 2.1 (#23980 )

2023-04-23 23:11:50 +02:00

config.ru

Autofix Rubocop remaining Layout rules (#23679 )

2023-02-20 06:58:28 +01:00

CONTRIBUTING.md

Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream

2023-12-21 18:17:17 +01:00

crowdin-glitch.yml

Fix Crowdin Github Action (#2311 )

2023-07-19 08:36:25 +02:00

crowdin.yml

Add a Github Action to send translations to Crowdin for each merge in main (#25869 )

2023-07-18 16:56:01 +02:00

docker-compose.yml

Bump version to v4.3.0-alpha.3 (#29241 )

2024-02-16 12:17:15 +01:00

Dockerfile

Use ruby version 3.2.3 (#28817 )

2024-01-22 11:55:51 +00:00

FEDERATION.md

docs: update FEDERATION.md to more closely follow FEP conventions. (#28838 )

2024-01-22 11:11:47 +00:00

Gemfile

Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream

2024-02-24 14:27:43 +01:00

Gemfile.lock

Update dependency haml_lint to v0.57.0 (#29181 )

2024-02-22 20:45:40 +01:00

ide-helper.js

…

jest.config.js

Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream

2024-01-15 20:06:31 +01:00

jsconfig.json

chore(deps): update devdependencies (non-major) (#28840 )

2024-01-23 11:44:50 +00:00

LICENSE

…

lint-staged.config.js

Improve lint-staged config (#28704 )

2024-01-12 09:09:57 +00:00

package.json

Remove unused dependencies (#29289 )

2024-02-22 20:45:40 +01:00

postcss.config.js

Update PostCSS dependencies (#23835 )

2023-03-15 04:01:10 +01:00

priv-config

…

Procfile

…

Procfile.dev

Split streaming server from web server (#24702 )

2023-11-14 17:43:20 +00:00

Rakefile

Run Rubocop on Rakefile (#23871 )

2023-07-12 09:47:54 +02:00

README.md

Doc update about ruby version 3.0+ (#29202 )

2024-02-14 16:44:27 +00:00

scalingo.json

Add S3 region list reference to Scalingo config (#24152 )

2023-04-26 16:46:19 +02:00

SECURITY.md

Remove v3.5 branch from supported Mastodon versions (#28574 )

2024-01-03 15:04:10 +00:00

stylelint.config.js

Merge branch 'main' into glitch-soc/merge-upstream

2023-04-29 10:44:56 +02:00

tsconfig.json

Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream

2024-01-24 20:42:53 +01:00

Vagrantfile

Change Vagrant to install Node 20 (#28100 )

2023-11-30 10:46:06 +00:00

yarn.lock

Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream

2024-02-24 14:46:14 +01:00

README.md

Mastodon Glitch Edition

Now with automated deploys!

So here's the deal: we all work on this code, and anyone who uses that does so absolutely at their own risk. can you dig it?

You can view documentation for this project at glitch-soc.github.io/docs/.
And contributing guidelines are available here and here.

Languages

Ruby 47.6%

JavaScript 23.7%

TypeScript 14.7%

SCSS 8.8%

Haml 3.2%

Other 2%