A glitchy but lovable microblogging server
Go to file
Thibaut Girka 1c448d6474 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/auth/sessions_controller.rb

Upstream reverted something we partially reverted already.
Reverted the rest to match upstream.
2018-10-30 17:52:08 +01:00
.circleci Merge branch 'master' into glitch-soc/merge-upstream 2018-10-28 08:37:49 +01:00
.github Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
app Merge branch 'master' into glitch-soc/merge-upstream 2018-10-30 17:52:08 +01:00
bin Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
config Merge branch 'master' into glitch-soc/merge-upstream 2018-10-30 17:52:08 +01:00
db Merge branch 'master' into glitch-soc/merge-upstream 2018-10-28 08:37:49 +01:00
dist
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-10-30 17:52:08 +01:00
log Initial commit 2016-02-20 22:53:20 +01:00
nanobox [Nanobox] Tuning Update (#6660) 2018-03-06 21:59:35 +01:00
public
spec Merge branch 'master' into glitch-soc/merge-upstream 2018-10-30 17:52:08 +01:00
streaming Fix crash when using UNIX socket (#9036) 2018-10-21 16:41:33 +02:00
vendor/assets
.buildpacks
.codeclimate.yml
.dockerignore
.editorconfig
.env.nanobox
.env.production.sample
.env.test Do not test PAM authentication by default (#9027) 2018-10-20 07:32:26 +02:00
.env.vagrant
.eslintignore
.eslintrc.yml
.foreman
.gitattributes
.gitignore
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc
.postcssrc.yml
.profile
.rspec
.rubocop.yml
.ruby-version Use Ruby ==2.5.2== 2.5.3 (#9003) 2018-10-18 22:32:47 +02:00
.scss-lint.yml
.slugignore
.yarnclean
app.json
Aptfile Adjust Aptfile for Heroku-18 stack (#8588) 2018-09-09 02:10:58 +02:00
AUTHORS.md Update AUTHORS.md (#9141) 2018-10-29 14:05:53 +01:00
babel.config.js
boxfile.yml
Capfile remove capistrano/faster_assets from Capfile (#2737) 2017-05-03 12:14:52 +02:00
CHANGELOG.md Bump version to 2.6.0rc4 (#9164) 2018-10-30 17:37:49 +01:00
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
docker-compose.yml Persist volumes by default in docker-compose (#9055) 2018-10-23 00:08:25 +02:00
Dockerfile Merge branch 'master' into glitch-soc/merge-upstream 2018-10-23 17:15:57 +02:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2018-10-30 11:22:25 +01:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2018-10-30 17:52:08 +01:00
jest.config.js
LICENSE Fix #49 - License changed from GPL-2.0 to AGPL-3.0 2016-09-21 23:04:34 +02:00
package.json Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
priv-config
Procfile
Procfile.dev
Rakefile
README.md Improve README (#9012) 2018-10-19 18:49:35 +02:00
scalingo.json
stack-fix.c
Vagrantfile
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2018-10-07 19:47:56 +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?