mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00

Go to file

Claire 86c9c5afa0 Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Upstream changed the order of Action Controller filters for web app
  controllers.
  Glitch-soc has an extra filter due to its theming system.
  Changed the order accordingly.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to an extra newline in glitch-soc.
  Removed that newline and applied upstream's changes.

2023-10-08 17:26:43 +02:00

.devcontainer

Update libretranslate/libretranslate Docker tag to v1.3.12 (#27214 )

2023-09-29 15:34:55 +02:00

.github

Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream

2023-10-08 17:05:40 +02:00

.husky

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

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

app

Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream

2023-10-08 17:26:43 +02: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 '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream

2023-10-08 17:26:43 +02:00

Fix some settings not being properly migrated when set to false

2023-09-21 15:17:44 +02:00

dist

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

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

lib

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

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

log

…

public

Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main

2023-08-13 18:47:15 +02:00

spec

Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream

2023-10-08 17:26:43 +02:00

streaming

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

2023-10-08 16:53:05 +02:00

vendor

Increase files checked by ESLint (#9705 )

2019-01-04 11:28:38 +01:00

.browserslistrc

Add ES6 compatibility to browserslist (#18519 )

2022-05-26 20:29:28 +02:00

.buildpacks

Remove nodejs buildpack from buildpacks (#14364 )

2020-07-20 09:48:10 +02:00

.bundler-audit.yml

Ignore CVE-2023-26141 (Sidekiq) from bundler audit (#27037 )

2023-09-22 10:13:09 +02:00

.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

Bump webpacker from 4.0.7 to 4.2.0 (#12416 )

2019-11-20 17:56:11 +01:00

.env.vagrant

Add elastic search installation into Vagrantfile (#26512 )

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

.eslintignore

Increase files checked by ESLint (#9705 )

2019-01-04 11:28:38 +01:00

.eslintrc.js

Add eslint rule to forbid vanilla imports in glitch (#2293 )

2023-07-13 21:36:23 +02:00

.foreman

…

.gitattributes

…

.gitignore

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

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

.gitmodules

…

.haml-lint_todo.yml

Fix haml-lint Rubocop Rails/* cops (#26042 )

2023-10-03 15:00:40 +02:00

.haml-lint.yml

Consistently use middle dot (·) instead of bullet (•) to separate items (#25248 )

2023-06-02 19:58:18 +02:00

.nanoignore

…

.nvmrc

Update dependency node to 20.8 (#27201 )

2023-09-29 09:50:15 +02:00

.prettierignore

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

2023-06-10 15:32:29 +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_todo.yml

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

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

.rubocop.yml

Move migration_helpers Rubocop ignore to config (#24236 )

2023-10-03 14:58:40 +02: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

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

Update babel monorepo to v7.22.5 (#25405 )

2023-06-14 09:22:54 +02:00

Capfile

Autofix Rubocop remaining Layout rules (#23679 )

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

CHANGELOG.md

Bump version to v4.2.0 (#27017 )

2023-09-21 16:51:32 +02: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

Fix glitch-soc Markdown linting issues (#2168 )

2023-04-08 17:23:24 +02: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.2.0 (#27017 )

2023-09-21 16:51:32 +02:00

Dockerfile

Update Node.js to v20.8 (#27240 )

2023-10-02 13:16:02 +02:00

FEDERATION.md

Update FEDERATION.md (#26819 )

2023-09-06 16:28:31 +02:00

Gemfile

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

2023-08-24 21:50:14 +02:00

Gemfile.lock

Update dependency haml_lint to v0.51.0 (#27250 )

2023-10-03 10:48:05 +02:00

ide-helper.js

Add JS IDE helper (#13012 )

2020-04-27 17:19:53 +02:00

jest.config.js

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

2023-06-10 15:32:29 +02:00

jsconfig.json

Correct prettier calls for YML/JSON (#21832 )

2022-12-03 12:05:35 +09:00

LICENSE

…

package.json

Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream

2023-10-08 16:48:19 +02:00

postcss.config.js

Update PostCSS dependencies (#23835 )

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

priv-config

…

Procfile

fix: make Procfile compatible with herokuish (#12685 )

2020-08-29 19:00:30 +02:00

Procfile.dev

Support webpacker live-reloading on Docker (#26419 )

2023-08-29 10:17:57 +02:00

Rakefile

Run Rubocop on Rakefile (#23871 )

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

README.md

Fix #27010 : update the copyright year in README (#27016 )

2023-09-21 13:57:24 +02:00

scalingo.json

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

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

SECURITY.md

Update supported versions in SECURITY.md (#26811 )

2023-09-06 10:00:25 +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

Vagrantfile

Add search tests (#26703 )

2023-09-08 16:17:55 +02:00

yarn.lock

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

2023-10-08 16:53:05 +02: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 49%

TypeScript 23.8%

JavaScript 17.2%

SCSS 6.5%

Haml 3.2%

Other 0.3%