A fork of glitch-soc.
 
 
 
 
 
 
Go to file
Thibaut Girka aae60a2366 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/concerns/two_factor_authentication_concern.rb`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes.
2020-06-24 15:33:41 +02:00
.circleci Fix the circleci packages for Buster. (#13583) 2020-05-01 23:45:40 +02:00
.github Disable dependabot 2020-06-09 13:09:17 +02:00
app Merge branch 'master' into glitch-soc/merge-upstream 2020-06-24 15:33:41 +02:00
bin Fix `tootctl media remove-orphans` choking on unknown files in storage (#13765) 2020-05-15 18:41:27 +02:00
config Merge branch 'master' into glitch-soc/merge-upstream 2020-06-17 17:10:15 +02:00
db Merge branch 'master' into glitch-soc/merge-upstream 2020-06-24 15:33:41 +02:00
dist
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
log
nanobox
public Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
spec Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
streaming Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
vendor
.buildpacks
.codeclimate.yml Bump rubocop from 0.79.0 to 0.82.0 (#13677) 2020-05-08 20:24:26 +02:00
.dockerignore
.editorconfig
.env.nanobox
.env.production.sample Merge branch 'master' into glitch-soc/merge-upstream 2020-05-10 16:19:56 +02:00
.env.test
.env.vagrant Add a default DB_HOST to .env.vagrant for enable the streaming (#14030) 2020-06-15 01:57:06 +02:00
.eslintignore
.eslintrc.js
.foreman
.gitattributes
.gitignore Add new vagrant log files to .gitignore (#13442) 2020-04-12 13:37:34 +02:00
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc
.profile
.rspec
.rubocop.yml fix rubocop errors (#13690) 2020-05-10 16:42:48 +02:00
.ruby-version Update .ruby-version (#13395) 2020-04-05 13:58:43 +02:00
.sass-lint.yml
.slugignore
.yarnclean
AUTHORS.md
Aptfile
CHANGELOG.md Bump version to 3.1.4 (#13750) 2020-05-14 07:46:11 +02:00
CODE_OF_CONDUCT.md
CONTRIBUTING.md
Capfile
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-06-17 17:10:15 +02:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2020-06-24 15:33:41 +02:00
LICENSE
Procfile
Procfile.dev
README.md Fix translation platform to Crowdin (#13443) 2020-04-10 08:24:23 +02:00
Rakefile
SECURITY.md Add Security Policy (#13946) 2020-06-03 08:32:23 +02:00
Vagrantfile Merge branch 'master' into glitch-soc/merge-upstream 2020-04-04 21:47:37 +02:00
app.json
babel.config.js
boxfile.yml
config.ru
crowdin.yml
docker-compose.yml Update Elasticsearch from 6.1 to 6.8 in docker-compose.yml (Fix glitch-soc#1348) (#14016) 2020-06-10 13:57:30 +02:00
ide-helper.js Add JS IDE helper (#13012) 2020-04-27 17:19:53 +02:00
package.json Merge branch 'master' into glitch-soc/merge-upstream 2020-06-24 15:33:41 +02:00
postcss.config.js
priv-config
scalingo.json
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2020-06-24 15:33:41 +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?