The glaceon.social flavour of glitch-soc, a Mastodon fork
Go to file
Claire 82eebd0482 Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream renamed an initial state parameter, where we had extra ones.
  Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
  Upstream wrapped database query in a block, we had extra database
  queries because of the DM timeline.
  Moved everything in the block.
2023-07-12 15:27:32 +02:00
.devcontainer Update mcr.microsoft.com/devcontainers/ruby Docker tag to v1 (#25613) 2023-06-27 11:28:07 +02:00
.github Tag images with the latest tag only when running against the latest stable branch (#25803) 2023-07-07 19:31:55 +02:00
.husky Use Yarn instead of NPX for pre-commit hook (#24287) 2023-03-28 06:28:57 +02:00
app Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream 2023-07-12 15:27:32 +02:00
bin Move the mastodon/*_cli files to mastodon/cli/* (#24139) 2023-05-23 16:08:26 +02:00
chart
config Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream 2023-07-12 15:27:32 +02:00
db Merge branch 'main' into glitch-soc/merge-upstream 2023-07-05 12:01:26 +02:00
dist Add hardened headers to user-uploaded files (#25756) 2023-07-06 14:31:37 +02:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2023-07-07 19:59:43 +02:00
log
public
spec Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream 2023-07-12 15:27:32 +02:00
streaming Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream 2023-06-18 10:36:14 +02:00
vendor
.browserslistrc
.buildpacks
.bundler-audit.yml Run bundler-audit on PRs (#23514) 2023-02-18 12:49:09 +01:00
.dockerignore
.editorconfig Enable EditorConfig trailing whitespace trimming (#23543) 2023-02-12 08:34:17 +01:00
.env.production.sample
.env.test
.env.vagrant
.eslintignore
.eslintrc.js Fix import order inconsistencies (#2289) 2023-07-12 15:00:10 +02:00
.foreman
.gitattributes
.gitignore
.gitmodules
.haml-lint.yml Consistently use middle dot (·) instead of bullet (•) to separate items (#25248) 2023-06-02 19:58:18 +02:00
.haml-lint_todo.yml Fix more haml-lint Rubocop (#24107) 2023-03-15 20:07:43 +01:00
.nanoignore
.nvmrc Update Node.js to 16.20.0 (#24316) 2023-04-07 14:26:11 +02:00
.prettierignore Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream 2023-06-10 15:32:29 +02:00
.prettierrc.js Use Prettier for ESLint formatting TypeScript (#23631) 2023-05-09 19:02:12 +02:00
.profile Make it possible to upload audio and video to Heroku app (#24866) 2023-05-05 14:41:07 +02:00
.rspec
.rubocop.yml Consistently use middle dot (·) instead of bullet (•) to separate items (#25248) 2023-06-02 19:58:18 +02:00
.rubocop_todo.yml Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream 2023-07-12 15:27:32 +02:00
.ruby-gemset
.ruby-version Bump ruby to 3.2.2 due to ReDoS vulnerabilities (#24320) 2023-03-31 18:28:40 +02:00
.slugignore
.yarnclean Setup Husky and lint-stage for commit fixing (#23308) 2023-03-27 05:17:19 +02:00
AUTHORS.md
Aptfile Make it possible to upload audio and video to Heroku app (#24866) 2023-05-05 14:41:07 +02:00
CHANGELOG.md Bump version to v4.1.4 (#25805) 2023-07-07 19:42:03 +02:00
CODE_OF_CONDUCT.md Update Contributor Covenant to 2.1 (#23980) 2023-04-23 23:11:50 +02:00
CONTRIBUTING.md Fix glitch-soc Markdown linting issues (#2168) 2023-04-08 17:23:24 +02:00
Capfile Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
Dockerfile Fix minor typos in comments and spec names (#21831) 2023-05-19 17:13:29 +02:00
FEDERATION.md
Gemfile Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream 2023-07-12 15:27:32 +02:00
Gemfile.lock First pass at multi-database for read replica using Rails native adapter (#25693) 2023-07-08 19:45:36 +02:00
LICENSE
Procfile
Procfile.dev
README.md Fix glitch-soc Markdown linting issues (#2168) 2023-04-08 17:23:24 +02:00
Rakefile
SECURITY.md Fix Markdown files with Prettier and check in CI (#21972) 2023-02-20 07:37:28 +01:00
Vagrantfile
app.json
babel.config.js Update babel monorepo to v7.22.5 (#25405) 2023-06-14 09:22:54 +02:00
config.ru Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
crowdin-glitch.yml
crowdin.yml Update Crowdin configuration file 2023-06-30 16:22:40 +02:00
docker-compose.yml Use Github Container Registry as the official container image source (#24113) 2023-03-15 16:41:13 +01:00
ide-helper.js
jest.config.js Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream 2023-06-10 15:32:29 +02:00
jsconfig.json
package.json Revert "Rails 7 update" (#25667) 2023-07-02 11:14:22 +02:00
postcss.config.js Update PostCSS dependencies (#23835) 2023-03-15 04:01:10 +01:00
priv-config
scalingo.json Add S3 region list reference to Scalingo config (#24152) 2023-04-26 16:46:19 +02:00
stylelint.config.js Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
tsconfig.json Merge commit '8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7' into glitch-soc/merge-upstream 2023-05-28 13:55:30 +02:00
yarn.lock Revert "Rails 7 update" (#25667) 2023-07-02 11:14:22 +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?