Alex Mastodon Fork
 
 
 
 
 
Go to file
Claire ac300173f6
Merge pull request #1719 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2022-03-15 21:57:26 +01:00
.circleci Update config.yml (#17799) 2022-03-15 22:11:09 +09:00
.devcontainer Add DevContainer config (#17764) 2022-03-13 15:03:36 +01:00
.github Merge branch 'main' into glitch-soc/merge-upstream 2022-03-15 20:45:27 +01:00
app Merge branch 'main' into glitch-soc/merge-upstream 2022-03-15 20:45:27 +01:00
bin
chart Helm chart SSO support (#17205) 2022-02-11 15:01:40 +01:00
config Merge branch 'main' into glitch-soc/merge-upstream 2022-03-15 20:45:27 +01:00
db Merge branch 'main' into glitch-soc/merge-upstream 2022-03-12 11:51:25 +01:00
dist Also compress SVG and ICO images in nginx (#17651) 2022-02-26 17:27:11 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-03-15 20:45:27 +01:00
log
nanobox
public Merge branch 'main' into glitch-soc/merge-upstream 2022-02-01 20:59:28 +01:00
spec Merge branch 'main' into glitch-soc/merge-upstream 2022-03-15 20:45:27 +01:00
streaming Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
vendor
.buildpacks
.codeclimate.yml Exclude locale files from Code Climate (#16863) 2021-10-18 12:04:42 +02:00
.deepsource.toml
.dockerignore Update .dockerignore/.gitignore for #16947 etc (#17099) 2021-12-06 18:04:04 +01:00
.editorconfig
.env.nanobox Remove support for OAUTH_REDIRECT_AT_SIGN_IN (#17287) 2022-01-23 15:50:41 +01:00
.env.production.sample Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
.env.test
.env.vagrant
.eslintignore
.eslintrc.js
.foreman
.gitattributes
.gitignore Update .dockerignore/.gitignore for #16947 etc (#17099) 2021-12-06 18:04:04 +01:00
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc NodeJS 14 support - circleci/docker/.nvmrc (#16163) 2021-08-10 22:56:13 +02:00
.profile
.rspec
.rubocop.yml Update fix-duplicates maintenance task (#17731) 2022-03-12 08:33:11 +01:00
.ruby-version Upgrade Ruby to 3.0.3 (#17038) 2021-11-24 20:29:05 +01:00
.sass-lint.yml
.slugignore
.yarnclean
AUTHORS.md Bump version to 3.5.0rc1 (#17618) 2022-03-15 08:16:45 +01:00
Aptfile Remove protobuf dependencies (#17539) 2022-02-14 16:08:02 +01:00
CHANGELOG.md Bump version to 3.5.0rc1 (#17618) 2022-03-15 08:16:45 +01:00
CODE_OF_CONDUCT.md
CONTRIBUTING.md Merge branch 'main' into glitch-soc/merge-upstream 2021-07-13 17:57:15 +02:00
Capfile
Dockerfile Remove protobuf dependencies (#17539) 2022-02-14 16:08:02 +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-03-15 20:45:27 +01:00
Gemfile.lock Merge branch 'main' into glitch-soc/merge-upstream 2022-03-15 20:45:27 +01:00
LICENSE
Procfile
Procfile.dev
README.md Bump version to 3.5.0rc1 (#17618) 2022-03-15 08:16:45 +01:00
Rakefile
SECURITY.md Remove references to discourse.joinmastodon.org (#17797) 2022-03-15 08:13:22 +01:00
Vagrantfile Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
app.json Change references to tootsuite/mastodon to mastodon/mastodon (#16491) 2021-07-13 15:46:20 +02:00
babel.config.js
boxfile.yml
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 Add healthcheck for sidekiq (#17365) 2022-01-26 18:08:49 +01:00
ide-helper.js
package.json Merge branch 'main' into glitch-soc/merge-upstream 2022-03-15 20:45:27 +01:00
postcss.config.js
priv-config
scalingo.json Change references to tootsuite/mastodon to mastodon/mastodon (#16491) 2021-07-13 15:46:20 +02:00
yarn.lock Merge branch 'main' into glitch-soc/merge-upstream 2022-03-15 20:45:27 +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?