A glitchy but lovable microblogging server
Go to file
Thibaut Girka 48f0f3ffee Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
  Upstream added the `bug` label to bug reports.
  Did the same.
- `app/services/fan_out_on_write_service.rb`:
  Upstream put DMs back into timelines, glitch-soc was already doing it.
  Ignored upstream changes.
2020-11-20 13:27:48 +01:00
.circleci
.github Merge branch 'master' into glitch-soc/merge-upstream 2020-11-20 13:27:48 +01:00
app Merge branch 'master' into glitch-soc/merge-upstream 2020-11-20 13:27:48 +01:00
bin
chart Fix postrgres secret name for cronjob (#15072) 2020-11-02 06:16:51 +01:00
config Merge branch 'master' into glitch-soc/merge-upstream 2020-11-20 13:27:48 +01:00
db Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
dist
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-11-20 13:27:48 +01:00
log
nanobox
public Merge branch 'master' into glitch-soc/merge-upstream 2020-09-28 14:13:30 +02:00
spec Merge branch 'master' into glitch-soc/merge-upstream 2020-11-20 13:27:48 +01:00
streaming Merge branch 'master' into glitch-soc/merge-upstream 2020-11-14 00:30:36 +01:00
vendor
.buildpacks
.codeclimate.yml Removed disabling comments for Style/MethodMissingSuper (#15014) 2020-10-20 09:13:39 +02:00
.dockerignore
.editorconfig
.env.nanobox
.env.production.sample
.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.7.2 (#15150) 2020-11-19 17:46:46 +01:00
.sass-lint.yml
.slugignore
.yarnclean
app.json
Aptfile
AUTHORS.md
babel.config.js
boxfile.yml
Capfile
CHANGELOG.md
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md
crowdin.yml
docker-compose.yml
Dockerfile Use Ruby 2.7.2 (#15150) 2020-11-19 17:46:46 +01:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2020-11-20 13:27:48 +01:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2020-11-20 13:27:48 +01:00
ide-helper.js
LICENSE
package.json Merge branch 'master' into glitch-soc/merge-upstream 2020-11-20 13:27:48 +01:00
postcss.config.js
priv-config
Procfile
Procfile.dev
Rakefile
README.md
scalingo.json
SECURITY.md
Vagrantfile
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2020-11-20 13:27:48 +01: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?