A glitchy but lovable microblogging server
Go to file
Thibaut Girka 9101254d0a Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream modified code that we split between multiple files due
  to glitch-soc's theming system.
  Ported those changes.
2020-04-05 18:32:06 +02:00
.circleci Update config.yml (#13379) 2020-04-04 15:52:42 +02:00
.dependabot
.github
app Merge branch 'master' into glitch-soc/merge-upstream 2020-04-05 18:32:06 +02:00
bin
config Merge branch 'master' into glitch-soc/merge-upstream 2020-04-05 18:32:06 +02:00
db Merge branch 'master' into glitch-soc/merge-upstream 2020-04-05 18:32:06 +02:00
dist Update nginx.conf (#13066) 2020-03-08 16:04:25 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-04-05 18:32:06 +02:00
log
nanobox
public
spec Merge branch 'master' into glitch-soc/merge-upstream 2020-04-04 21:47:37 +02:00
streaming
vendor
.buildpacks
.codeclimate.yml
.dockerignore
.editorconfig
.env.nanobox
.env.production.sample
.env.test
.env.vagrant
.eslintignore
.eslintrc.js
.foreman
.gitattributes
.gitignore
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc
.profile
.rspec
.rubocop.yml
.ruby-version Update .ruby-version (#13395) 2020-04-05 13:58:43 +02:00
.sass-lint.yml
.slugignore
.yarnclean
app.json
Aptfile
AUTHORS.md Update AUTHORS.md (#12096) 2019-10-07 04:36:32 +02:00
babel.config.js
boxfile.yml
Capfile
CHANGELOG.md Update CHANGELOG.md (#13397) 2020-04-05 15:18:41 +02:00
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md
crowdin.yml
docker-compose.yml
Dockerfile [Security] Update Dockerfile for Ruby 2.6.6 (#13393) 2020-04-05 12:52:07 +02:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2020-04-05 18:32:06 +02:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2020-04-05 18:32:06 +02:00
LICENSE
package.json Merge branch 'master' into glitch-soc/merge-upstream 2020-04-05 18:32:06 +02:00
postcss.config.js
priv-config
Procfile
Procfile.dev
Rakefile
README.md Decommission support for Ruby 2.4 (#13287) 2020-03-21 03:10:24 +01:00
scalingo.json
Vagrantfile Merge branch 'master' into glitch-soc/merge-upstream 2020-04-04 21:47:37 +02:00
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2020-04-05 18:32:06 +02:00

Mastodon Glitch Edition

Now with automated deploys!

Build Status

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?