Mirror of glitch-soc/mastodon@github.com
Go to file
Claire 1901829f9a Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Our config file is pretty different from upstream.
  Upstream changed CSP directive `script-src` to include
  `wasm-unsafe-eval` instead of `unsafe-eval`, which we
  did not include.
  Added `wasm-unsafe-eval` to `script-src` to fix
  execution of the OCR web worker.
- `package.json`:
  Upstream updated a dependency (`array-includes`) textually
  adjacent to a glitch-soc-only dependency (`atrament`).
  Updated `array-includes` as upstream did.
2022-11-16 08:30:00 +01:00
.circleci
.devcontainer
.github Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 08:35:55 +01:00
app Merge branch 'main' into glitch-soc/merge-upstream 2022-11-16 08:30:00 +01:00
bin
chart helm: Add helm chart tests (#20394) 2022-11-13 22:22:07 +01:00
config Merge branch 'main' into glitch-soc/merge-upstream 2022-11-16 08:30:00 +01:00
db
dist Fix nginx location matching (#20198) 2022-11-09 04:12:57 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-11-16 08:30:00 +01:00
log
public
spec Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 20:27:31 +01:00
streaming Merge branch 'main' into glitch-soc/merge-upstream 2022-11-15 02:10:37 +01:00
vendor
.browserslistrc
.buildpacks
.codeclimate.yml
.deepsource.toml
.dockerignore
.editorconfig
.env.production.sample
.env.test
.env.vagrant
.eslintignore
.eslintrc.js
.foreman
.gitattributes
.gitignore Helm update readme.md (#20154) 2022-11-10 19:09:54 +01:00
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc
.prettierignore
.prettierrc.js
.profile
.rspec
.rubocop.yml
.ruby-gemset
.ruby-version
.slugignore
.yarnclean
AUTHORS.md Update AUTHORS.md (#20630) 2022-11-14 08:33:24 +01:00
Aptfile
CHANGELOG.md Bump version to 4.0.2 (#20725) 2022-11-15 03:57:18 +01:00
CODE_OF_CONDUCT.md
CONTRIBUTING.md Merge branch 'main' into glitch-soc/merge-upstream 2022-11-12 13:28:03 +01:00
Capfile
Dockerfile
FEDERATION.md
Gemfile Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 20:27:31 +01:00
Gemfile.lock Merge branch 'main' into glitch-soc/merge-upstream 2022-11-16 08:30:00 +01:00
LICENSE
Procfile
Procfile.dev
README.md
Rakefile
SECURITY.md Change e-mail in SECURITY.md (#20384) 2022-11-11 05:26:43 +01:00
Vagrantfile
app.json Make enable_starttls configurable by envvars (#20321) 2022-11-10 21:06:21 +01:00
babel.config.js
config.ru
crowdin.yml
docker-compose.yml
ide-helper.js
jest.config.js
jsconfig.json
package.json Merge branch 'main' into glitch-soc/merge-upstream 2022-11-16 08:30:00 +01:00
postcss.config.js
priv-config
scalingo.json Make enable_starttls configurable by envvars (#20321) 2022-11-10 21:06:21 +01:00
stylelint.config.js
yarn.lock Merge branch 'main' into glitch-soc/merge-upstream 2022-11-16 08:30:00 +01:00

README.md

Mastodon Glitch Edition

Now with automated deploys!

Build Status Code Climate

So here's the deal: we all work on this code, and anyone who uses that does so absolutely at their own risk. can you dig it?