Alex Mastodon Fork
 
 
 
 
 
Go to file
Claire fc500a6062 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `CONTRIBUTING.md`:
  Upstream file has changed and we're quoting it.
  Ported the changes.
- `README.md`:
  Upstream file has changed but we have a completely different one.
  Kept our version.
- `lib/mastodon/version.rb`:
  Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`,
  but we're still `glitch-soc/mastodon`.
  Kept our version.
- `spec/presenters/instance_presenter_spec.rb`:
  Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`,
  but we're still `glitch-soc/mastodon`.
  Kept our version.
2021-07-13 17:57:15 +02:00
.circleci Add Actions for check i18n () 2021-05-22 15:00:20 +02:00
.github Merge branch 'main' into glitch-soc/merge-upstream 2021-07-13 17:57:15 +02:00
app Merge branch 'main' into glitch-soc/merge-upstream 2021-07-13 17:57:15 +02:00
bin Update Mastodon to Rails 6.1 () 2021-03-24 10:44:31 +01:00
chart helm: upgrade elasticsearch chart to 14 () 2021-03-12 05:39:09 +01:00
config Merge branch 'main' into glitch-soc/merge-upstream 2021-07-13 17:57:15 +02:00
db Merge branch 'main' into glitch-soc/merge-upstream 2021-07-13 17:57:15 +02:00
dist Preload libjemalloc.so for long-running Ruby () 2021-07-05 19:16:35 +02:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-07-13 17:57:15 +02:00
log
nanobox
public Merge branch 'main' into glitch-soc/merge-upstream 2021-06-03 20:47:02 +02:00
spec Merge branch 'main' into glitch-soc/merge-upstream 2021-07-13 17:57:15 +02:00
streaming Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
vendor
.buildpacks
.codeclimate.yml Bump rubocop from 1.8.1 to 1.9.1 () 2021-02-12 00:10:00 +09:00
.deepsource.toml Update .deepsource.toml () 2021-02-19 09:53:25 +01:00
.dockerignore Ignore git related files from docker build () 2021-05-22 17:43:07 +02:00
.editorconfig
.env.nanobox
.env.production.sample Add environment variables to control custom emoji size limits 2021-04-26 11:22:22 +02:00
.env.test
.env.vagrant
.eslintignore
.eslintrc.js
.foreman
.gitattributes
.gitignore helm: pin versions, commit lockfile () 2021-02-19 09:56:40 +01:00
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc
.profile
.rspec
.rubocop.yml
.ruby-version Use ruby-2.7.4 () 2021-07-10 01:29:27 +02:00
.sass-lint.yml
.slugignore
.yarnclean
AUTHORS.md Change references to tootsuite/mastodon to mastodon/mastodon () 2021-07-13 15:46:20 +02:00
Aptfile
CHANGELOG.md Change references to tootsuite/mastodon to mastodon/mastodon () 2021-07-13 15:46:20 +02: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 Use ruby-2.7.4 () 2021-07-10 01:29:27 +02:00
Gemfile Merge branch 'main' into glitch-soc/merge-upstream 2021-07-11 21:41:23 +02:00
Gemfile.lock Merge branch 'main' into glitch-soc/merge-upstream 2021-07-11 21:41:23 +02:00
LICENSE
Procfile
Procfile.dev
README.md Merge branch 'main' into glitch-soc/merge-upstream 2021-07-13 17:57:15 +02:00
Rakefile
SECURITY.md Fix security policy () 2021-05-16 23:50:16 +02:00
Vagrantfile Merge branch 'main' into glitch-soc/merge-upstream 2021-05-17 10:30:34 +02:00
app.json Change references to tootsuite/mastodon to mastodon/mastodon () 2021-07-13 15:46:20 +02:00
babel.config.js Remove dependency for @babel/plugin-proposal-class-properties () 2021-05-04 23:13:04 +02:00
boxfile.yml
config.ru
crowdin.yml
docker-compose.yml Update docker-compose.yml () 2021-07-11 12:57:31 +02:00
ide-helper.js
package.json Merge branch 'main' into glitch-soc/merge-upstream 2021-07-13 17:57:15 +02:00
postcss.config.js
priv-config
scalingo.json Change references to tootsuite/mastodon to mastodon/mastodon () 2021-07-13 15:46:20 +02:00
yarn.lock Merge branch 'main' into glitch-soc/merge-upstream 2021-07-11 21:41:23 +02: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 then it runs on dev.glitch.social and anyone who uses that does so absolutely at their own risk. can you dig it?