A glitchy but lovable microblogging server
Go to file
Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
.circleci Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
.dependabot
.github
app Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
bin
config Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
db Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
dist
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
log
nanobox
public
spec Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
streaming
vendor
.buildpacks
.codeclimate.yml
.dockerignore
.editorconfig
.env.nanobox
.env.production.sample Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
.env.test
.env.vagrant
.eslintignore
.eslintrc.js
.foreman
.gitattributes
.gitignore
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc
.profile
.rspec
.rubocop.yml
.ruby-version Use Ruby-2.6.4 (#11942) 2019-09-25 02:07:11 +02:00
.sass-lint.yml
.slugignore
.yarnclean
app.json Remove deprecated config from Heroku and Scalingo (#11925) 2019-09-23 12:11:59 +02:00
Aptfile
AUTHORS.md
babel.config.js
boxfile.yml
Capfile
CHANGELOG.md Bump version to 3.0.0rc2 (#11999) 2019-09-29 18:50:16 +02:00
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md
crowdin.yml Update Crowdin configuration file 2019-09-14 11:40:13 +02:00
docker-compose.yml Add healthcheck endpoint for web (#11770) 2019-09-07 02:47:51 +02:00
Dockerfile Use prebuilt node.js on Docker image (#11768) 2019-09-07 05:12:20 +02:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
LICENSE
package.json Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
postcss.config.js
priv-config
Procfile
Procfile.dev
Rakefile
README.md
scalingo.json Remove deprecated config from Heroku and Scalingo (#11925) 2019-09-23 12:11:59 +02:00
Vagrantfile
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +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?