mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-19 22:22:53 -05:00

Go to file

Claire a482932649 Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/application_controller.rb`:
  Not a real conflict, upstream fixed a bug in a line adjacent to code
  modified by glitch-soc.
  Ported upstream's change.

2024-02-27 19:20:57 +01:00

.devcontainer

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

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

.github

Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream

2024-02-27 19:20:57 +01:00

.husky

Update husky and remove deprecated features (#29338 )

2024-02-22 09:02:15 +00:00

.yarn

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

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

app

Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream

2024-02-27 19:20:57 +01:00

bin

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

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

chart

…

config

Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream

2024-02-27 19:20:57 +01:00

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

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

dist

…

lib

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

2024-02-24 15:43:15 +01:00

log

…

public

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

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

spec

Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream

2024-02-27 19:20:57 +01:00

streaming

Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream

2024-02-27 19:20:57 +01:00

vendor

…

.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

…

.editorconfig

…

.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

…

.env.vagrant

…

.eslintignore

…

.eslintrc.js

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

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

.foreman

…

.gitattributes

…

.gitignore

…

.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

…

.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

…

.profile

…

.rspec

…

.rubocop_todo.yml

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

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

.rubocop.yml

Re-enable fixed Style/Semicolon cop (#29212 )

2024-02-19 13:35:13 +00:00

.ruby-gemset

…

.ruby-version

Use ruby version 3.2.3 (#28817 )

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

.simplecov

…

.slugignore

…

.watchmanconfig

Fix Jest config (#27834 )

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

.yarnrc.yml

…

app.json

…

Aptfile

…

AUTHORS.md

Update AUTHORS.md (#27018 )

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

babel.config.js

…

CHANGELOG.md

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

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

CODE_OF_CONDUCT.md

…

config.ru

…

CONTRIBUTING.md

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

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

crowdin-glitch.yml

…

crowdin.yml

…

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 thor to v1.3.1 (#29421 )

2024-02-27 11:48:42 +00: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

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

2024-02-24 15:43:15 +01:00

postcss.config.js

…

priv-config

…

Procfile

…

Procfile.dev

…

Rakefile

…

README.md

Doc update about ruby version 3.0+ (#29202 )

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

scalingo.json

…

SECURITY.md

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

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

stylelint.config.js

…

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 '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream

2024-02-26 17:43:16 +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 49%

JavaScript 26.4%

TypeScript 13.2%

SCSS 7.7%

Haml 3.4%

Other 0.3%