Go to file
Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
.circleci Fix CircleCI (#9695) 2019-01-02 20:48:22 +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 2019-05-04 16:37:26 +02:00
bin Bump webpacker from 3.5.5 to 4.0.2 (#10277) 2019-03-15 15:05:31 +01:00
config Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 16:37:26 +02:00
db Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 16:37:26 +02:00
dist Cache error 410 responses in recommended nginx configuration (#10425) 2019-03-30 03:14:31 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 16:37:26 +02:00
log
nanobox Update Nginx config for Nanobox apps (#9310) 2018-11-20 22:24:35 +01:00
public Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 16:37:26 +02:00
spec Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 16:37:26 +02:00
streaming Merge branch 'master' into glitch-soc/merge-upstream 2019-03-11 11:23:50 +01:00
vendor Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
.buildpacks
.codeclimate.yml Upgrade ESLint to v5.x (#9694) 2019-01-02 07:28:53 +01:00
.dockerignore
.editorconfig
.env.nanobox
.env.production.sample added documentation into .env.production.sample 2019-04-29 20:52:53 +02:00
.env.test Do not test PAM authentication by default (#9027) 2018-10-20 07:32:26 +02:00
.env.vagrant
.eslintignore Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
.eslintrc.js Refactor icons in web UI to use Icon component (#9951) 2019-02-01 00:14:05 +01:00
.foreman
.gitattributes
.gitignore
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc
.profile
.rspec
.rubocop.yml Add `tootctl self-destruct` (#10367) 2019-03-28 17:56:25 +01:00
.ruby-version Upgrade Ruby to 2.6.1 (#9956) 2019-02-20 11:57:08 +01:00
.scss-lint.yml
.slugignore
.yarnclean
AUTHORS.md Bump version to 2.8.0rc1 (#10340) 2019-03-30 02:13:42 +01:00
Aptfile
CHANGELOG.md Bump version to 2.8.1 (#10687) 2019-05-04 00:31:06 +02:00
CODE_OF_CONDUCT.md
CONTRIBUTING.md Merge branch 'master' into glitch-soc/merge-upstream 2019-01-28 21:14:47 +01:00
Capfile
Dockerfile Re-organize Dockerfile to improve incremental builds. (#10212) 2019-03-08 16:12:48 +01:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 16:37:26 +02:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 16:37:26 +02:00
LICENSE
Procfile
Procfile.dev
README.md Bumps copyright year in README.md to 2019 (#9939) 2019-01-28 22:57:42 +01:00
Rakefile
Vagrantfile Merge branch 'master' into glitch-soc/merge-upstream 2019-03-10 16:48:44 +01:00
app.json
babel.config.js Weblate translations (2019-04-10) (#10545) 2019-04-10 18:17:24 +02:00
boxfile.yml
config.ru
docker-compose.yml Fixed Healthchecks in docker-compose.yml (#10553) 2019-04-23 00:54:26 +02:00
package.json Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 16:37:26 +02:00
postcss.config.js Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
priv-config
scalingo.json
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 16:37:26 +02:00

README.md

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?