Mirror of glitch-soc/mastodon@github.com
Go to file
Claire b6b68b44a1 Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream
Conflicts:
- `Vagrantfile`:
  Upstream bumped a bunch of values, including one that was already bumped by
  glitch-soc.
  Took upstream's version.
- `lib/paperclip/transcoder.rb`:
  glitch-soc already had a partial fix for this.
  Took upstream's version.
2023-08-24 21:46:17 +02:00
.devcontainer
.github
.husky
app Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream 2023-08-24 21:46:17 +02:00
bin
chart
config Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream 2023-08-24 21:26:27 +02:00
db Merge commit 'ee702e36e58d638bcf75b2eae2ca86499693465e' into glitch-soc/merge-upstream 2023-08-24 20:55:28 +02:00
dist
lib Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream 2023-08-24 21:46:17 +02:00
log
public
spec Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream 2023-08-24 21:26:27 +02:00
streaming Merge commit 'ee702e36e58d638bcf75b2eae2ca86499693465e' into glitch-soc/merge-upstream 2023-08-24 20:55:28 +02:00
vendor
.browserslistrc
.buildpacks
.dockerignore
.editorconfig
.env.production.sample
.env.test
.env.vagrant Add elastic search installation into Vagrantfile (#26512) 2023-08-23 15:46:14 +02:00
.eslintignore
.eslintrc.js
.foreman
.gitattributes
.gitignore
.gitmodules
.haml-lint.yml
.haml-lint_todo.yml
.nanoignore
.nvmrc
.prettierignore
.prettierrc.js
.profile
.rspec
.rubocop.yml
.rubocop_todo.yml Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream 2023-08-24 21:26:27 +02:00
.ruby-gemset
.ruby-version
.slugignore
.yarnclean
AUTHORS.md
Aptfile
CHANGELOG.md
CODE_OF_CONDUCT.md
CONTRIBUTING.md
Capfile
Dockerfile
FEDERATION.md
Gemfile
Gemfile.lock Update dependency oj to v3.16.0 (#26520) 2023-08-23 15:45:38 +02:00
LICENSE
Procfile
Procfile.dev
README.md
Rakefile
SECURITY.md
Vagrantfile Add elastic search installation into Vagrantfile (#26512) 2023-08-23 15:46:14 +02:00
app.json
babel.config.js
config.ru
crowdin-glitch.yml
crowdin.yml
docker-compose.yml
ide-helper.js
jest.config.js
jsconfig.json
package.json Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream 2023-08-24 21:26:27 +02:00
postcss.config.js
priv-config
scalingo.json
stylelint.config.js
tsconfig.json
yarn.lock Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream 2023-08-24 21:46:17 +02: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?