A fork of glitch-soc.

Go to file

Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring		2022-12-15 20:25:25 +01:00
.circleci	Update circleci (#21880 )	2022-12-15 18:13:13 +01:00
.devcontainer	Dont use reserved foldername (#20582 )	2022-12-15 18:49:43 +01:00
.github	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
app	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
bin	Update Mastodon to Rails 6.1 (#15910 )	2021-03-24 10:44:31 +01:00
chart	helm: cleanup helm chart, now in mastodon/chart (#21801 )	2022-12-09 06:36:29 +01:00
config	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
db	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-07 09:03:42 +01:00
dist	Fix nginx location matching (#20198 )	2022-11-09 04:12:57 +01:00
lib	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
log	…
public	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
spec	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
streaming	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-15 02:10:37 +01:00
vendor	…
.browserslistrc	Add ES6 compatibility to browserslist (#18519 )	2022-05-26 20:29:28 +02:00
.buildpacks	…
.codeclimate.yml	Replace from Code Climate to Super-Linter (#18587 )	2022-06-01 19:22:35 +02:00
.deepsource.toml	…
.dockerignore	Update .dockerignore/.gitignore for #16947 etc (#17099 )	2021-12-06 18:04:04 +01:00
.editorconfig	…
.env.production.sample	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
.env.test	…
.env.vagrant	…
.eslintignore	…
.eslintrc.js	Replace from Code Climate to Super-Linter (#18587 )	2022-06-01 19:22:35 +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.yml	Added haml-lint and fix warnings (#2773 )	2017-05-08 03:35:25 +02:00
.nanoignore	…
.nvmrc	Align everything to Node.js 16 (#22223 )	2022-12-15 17:43:26 +01:00
.prettierignore	helm: cleanup helm chart, now in mastodon/chart (#21801 )	2022-12-09 06:36:29 +01:00
.prettierrc.js	Format JSON and YAML using Prettier (#17823 )	2022-03-21 04:46:11 +01:00
.profile	…
.rspec	…
.rubocop.yml	linting: RuboCop update, config fixes (#20574 )	2022-12-15 16:39:59 +01:00
.ruby-gemset	Make Mastodon use its own gemset (#17858 )	2022-08-13 15:44:34 +02:00
.ruby-version	Bump Ruby version from 3.0.3 to 3.0.4 (#18028 )	2022-08-15 04:39:58 +02:00
.slugignore	…
.yarnclean	…
AUTHORS.md	Update AUTHORS.md (#20630 )	2022-11-14 08:33:24 +01:00
Aptfile	Remove packages that are provided by Heroku stacks (#19836 )	2022-12-15 18:55:29 +01:00
CHANGELOG.md	Bump version to 4.0.2 (#20725 )	2022-11-15 03:57:18 +01:00
CODE_OF_CONDUCT.md	…
CONTRIBUTING.md	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00
Capfile	…
Dockerfile	Add hadolint as Dockerfile linter (#20993 )	2022-12-15 15:57:17 +01:00
FEDERATION.md	Add FEDERATION.md (#17029 )	2021-11-23 00:15:31 +01:00
Gemfile	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
Gemfile.lock	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
LICENSE	…
Procfile	…
Procfile.dev	…
README.md	Align everything to Node.js 16 (#22223 )	2022-12-15 17:43:26 +01:00
Rakefile	…
SECURITY.md	Change e-mail in SECURITY.md (#20384 )	2022-11-11 05:26:43 +01:00
Vagrantfile	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-07 09:03:42 +01:00
app.json	Make enable_starttls configurable by envvars (#20321 )	2022-11-10 21:06:21 +01:00
babel.config.js	Remove dependency for @babel/plugin-proposal-class-properties (#16155 )	2021-05-04 23:13:04 +02:00
config.ru	…
crowdin.yml	Prevent translations from accidentally becoming completely different from source strings on Crowdin without translators noticing. (#17085 )	2021-12-01 19:03:35 +01:00
docker-compose.yml	Update docker-compose.yml (#19063 )	2022-08-27 17:40:46 +02:00
ide-helper.js	…
jest.config.js	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-04 19:15:50 +02:00
jsconfig.json	Correct prettier calls for YML/JSON (#21832 )	2022-12-03 12:05:35 +09:00
package.json	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
postcss.config.js	…
priv-config	…
scalingo.json	Make enable_starttls configurable by envvars (#20321 )	2022-11-10 21:06:21 +01:00
stylelint.config.js	Replace from Code Climate to Super-Linter (#18587 )	2022-06-01 19:22:35 +02:00
yarn.lock	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-14 09:10:49 +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.