A glitchy but lovable microblogging server
Go to file
Thibaut Girka db200226b8 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/javascript/mastodon/initial_state.js
	db/schema.rb

Upstream added a new field to initial_state.
Not too sure about what happened with db/schema.rb though…
2018-06-15 20:51:39 +02:00
.circleci
.github
app Merge branch 'master' into glitch-soc/merge-upstream 2018-06-15 20:51:39 +02:00
bin
config Merge branch 'master' into glitch-soc/merge-upstream 2018-06-15 20:51:39 +02:00
db Merge branch 'master' into glitch-soc/merge-upstream 2018-06-15 20:51:39 +02:00
docs
lib Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-06-12 13:17:21 +00:00
log
nanobox
public Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-06-12 13:17:21 +00:00
spec Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-06-14 06:17:24 +00:00
streaming Add media timeline (#6631) 2018-05-21 12:43:38 +02:00
vendor/assets
.babelrc
.buildpacks
.codeclimate.yml fix RuboCop error (#7442) 2018-06-04 14:49:10 +02:00
.dockerignore
.editorconfig
.env.nanobox
.env.production.sample Merge branch 'master' into glitch-soc/merge-upstream 2018-05-29 13:52:26 +02:00
.env.test
.env.vagrant
.eslintignore
.eslintrc.yml Merge remote-tracking branch 'origin/master' into gs-master 2018-06-02 16:15:36 -05:00
.foreman
.gitattributes
.gitignore
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc
.postcssrc.yml
.profile
.rspec
.rubocop.yml fix RuboCop error (#7442) 2018-06-04 14:49:10 +02:00
.ruby-version
.scss-lint.yml
.slugignore
.travis.yml ci: Hack around a Travis condition, I guess 2018-05-18 09:51:00 -05:00
.yarnclean
app.json
Aptfile
AUTHORS.md
boxfile.yml
Capfile
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md
docker-compose.yml Remove Puma pidfile before boot if container receives SIGTERM (#7052) 2018-05-25 18:50:31 +02:00
Dockerfile
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2018-06-15 20:51:39 +02:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2018-06-15 20:51:39 +02:00
jest.config.js
LICENSE
package.json Merge remote-tracking branch 'origin/master' into gs-master 2018-06-02 16:15:36 -05:00
Procfile
Procfile.dev
Rakefile
README.md
scalingo.json
stack-fix.c
Vagrantfile
yarn.lock Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-06-12 13:17:21 +00: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?