Go to file
Claire 537b88330d
Merge pull request #2514 from ClearlyClaire/glitch-soc/main
Merge upstream changes up to a916251d8a
2023-12-17 17:42:22 +01:00
.devcontainer Update libretranslate/libretranslate Docker tag to v1.4.1 (#27616) 2023-10-30 14:19:20 +00:00
.github Merge commit '15182d1e5e595b21c47b48c5d258f30a0251e753' into glitch-soc/merge-upstream 2023-10-24 20:31:20 +02:00
.husky Use Yarn instead of NPX for pre-commit hook (#24287) 2023-03-28 06:28:57 +02:00
app Fix HAML linting issue 2023-12-17 16:37:11 +01:00
bin Move the mastodon/*_cli files to mastodon/cli/* (#24139) 2023-05-23 16:08:26 +02:00
chart helm: cleanup helm chart, now in mastodon/chart (#21801) 2022-12-09 06:36:29 +01:00
config Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main 2023-12-17 15:32:29 +01:00
db Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream 2023-10-19 19:14:04 +02:00
dist Add suggestion for secure cyphers to nginx.conf (#26349) 2023-08-31 12:17:10 +02:00
lib Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream 2023-12-10 18:05:02 +01:00
log
public Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main 2023-08-13 18:47:15 +02:00
spec Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main 2023-12-17 15:32:29 +01:00
streaming Merge commit '774e1189d26fffd914107a4236f6287043c988f8' into glitch-soc/merge-upstream 2023-10-09 21:12:28 +02:00
vendor
.browserslistrc Add ES6 compatibility to browserslist (#18519) 2022-05-26 20:29:28 +02:00
.buildpacks
.dockerignore Update .dockerignore/.gitignore for #16947 etc (#17099) 2021-12-06 18:04:04 +01:00
.editorconfig Enable EditorConfig trailing whitespace trimming (#23543) 2023-02-12 08:34:17 +01:00
.env.production.sample Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
.env.test
.env.vagrant Add elastic search installation into Vagrantfile (#26512) 2023-08-23 15:46:14 +02:00
.eslintignore
.eslintrc.js Merge commit '1b70d7ed7c0fd3a9fcf028bf76b8c62ac8b3897f' into glitch-soc/merge-upstream 2023-10-21 14:33:33 +02:00
.foreman
.gitattributes
.gitignore Remove Capistrano (#27295) 2023-10-06 11:33:43 +02:00
.gitmodules
.haml-lint.yml Update haml-lint line length configuration to match rubocop value (#27570) 2023-10-31 09:47:16 +00:00
.haml-lint_todo.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.9 (#27534) 2023-10-25 07:16:19 +00:00
.prettierignore Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream 2023-10-08 17:30:48 +02: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.yml Move migration_helpers Rubocop ignore to config (#24236) 2023-10-03 14:58:40 +02:00
.rubocop_todo.yml Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main 2023-12-17 15:32:29 +01:00
.ruby-gemset Make Mastodon use its own gemset (#17858) 2022-08-13 15:44:34 +02:00
.ruby-version Bump ruby to 3.2.2 due to ReDoS vulnerabilities (#24320) 2023-03-31 18:28:40 +02:00
.slugignore
.yarnclean Setup Husky and lint-stage for commit fixing (#23308) 2023-03-27 05:17:19 +02:00
AUTHORS.md Update AUTHORS.md (#27018) 2023-09-21 14:42:15 +02:00
Aptfile Make it possible to upload audio and video to Heroku app (#24866) 2023-05-05 14:41:07 +02:00
CHANGELOG.md Prune the changelog of older entries (#27432) 2023-10-23 14:35:56 +02:00
CODE_OF_CONDUCT.md Update Contributor Covenant to 2.1 (#23980) 2023-04-23 23:11:50 +02:00
CONTRIBUTING.md Fix glitch-soc Markdown linting issues (#2168) 2023-04-08 17:23:24 +02:00
Dockerfile Fix missing libyaml-dev dependency in Dockerfile (#27533) 2023-10-24 17:32:10 +00:00
FEDERATION.md Update FEDERATION.md (#26819) 2023-09-06 16:28:31 +02:00
Gemfile Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main 2023-12-17 15:32:29 +01:00
Gemfile.lock Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main 2023-12-17 15:32:29 +01:00
LICENSE
Procfile
Procfile.dev Support webpacker live-reloading on Docker (#26419) 2023-08-29 10:17:57 +02:00
README.md Capture minimum postgres version 12 (#27528) 2023-10-26 20:35:15 +00:00
Rakefile Run Rubocop on Rakefile (#23871) 2023-07-12 09:47:54 +02:00
SECURITY.md Add 4.2.x to supported versions in SECURITY.md (#27317) 2023-10-07 21:12:21 +02:00
Vagrantfile Add search tests (#26703) 2023-09-08 16:17:55 +02:00
app.json Make enable_starttls configurable by envvars (#20321) 2022-11-10 21:06:21 +01:00
babel.config.js Update babel monorepo to v7.22.5 (#25405) 2023-06-14 09:22:54 +02:00
config.ru Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +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 Let use http_hidden_proxy on docker-compose (#27054) 2023-10-17 15:24:45 +02:00
ide-helper.js
jest.config.js Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream 2023-10-25 12:14:24 +02:00
jsconfig.json Correct prettier calls for YML/JSON (#21832) 2022-12-03 12:05:35 +09:00
package.json Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream 2023-10-25 12:14:24 +02:00
postcss.config.js Update PostCSS dependencies (#23835) 2023-03-15 04:01:10 +01:00
priv-config
scalingo.json Add S3 region list reference to Scalingo config (#24152) 2023-04-26 16:46:19 +02:00
stylelint.config.js Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
tsconfig.json Fix interaction modal being broken because of glitch-soc's theming system 2023-07-30 16:45:50 +02:00
yarn.lock Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main 2023-12-17 15:32:29 +01:00

README.md

Mastodon Glitch Edition

Now with automated deploys!

Build Status Code Climate

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?