queer.af mastodon fork
Go to file
Claire 7452a95998 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes while we have dropped this file.
  Keep the file deleted.
- `.prettierignore`:
  Upstream made changes at the end of the file, where we
  had our extra lines.
  Just moved our extra lines back at the end.
- `app/serializers/initial_state_serializer.rb`:
  Upstream code style changes.
  Applied them.
- `app/services/backup_service.rb`:
  Upstream code style changes.
  Applied them.
2023-02-19 10:42:55 +01:00
.circleci Move db migration CI to GitHub Actions (#23624) 2023-02-19 07:06:34 +01:00
.devcontainer Fix devcontainer.json format (#23715) 2023-02-19 07:02:46 +01:00
.github Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
app Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
bin
chart helm: cleanup helm chart, now in mastodon/chart (#21801) 2022-12-09 06:36:29 +01:00
config Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
db Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
dist Fix nginx location matching (#20198) 2022-11-09 04:12:57 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
log
public Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
spec Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
streaming Merge branch 'main' into glitch-soc/merge-upstream 2023-02-13 19:35:35 +01:00
vendor
.browserslistrc Add ES6 compatibility to browserslist (#18519) 2022-05-26 20:29:28 +02:00
.buildpacks
.bundler-audit.yml Run bundler-audit on PRs (#23514) 2023-02-18 12:49:09 +01:00
.codeclimate.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 Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
.env.test
.env.vagrant
.eslintignore
.eslintrc.js Enable ESLint Promise plugin defaults (#22229) 2023-02-16 15:30:56 +09:00
.foreman
.gitattributes
.gitignore helm: cleanup helm chart, now in mastodon/chart (#21801) 2022-12-09 06:36:29 +01:00
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc Sync Node.js to 16.19 patch release (#23554) 2023-02-13 04:58:37 +01:00
.prettierignore Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
.prettierrc.js Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
.profile
.rspec
.rubocop.yml Remove Style/Copyright Rubocop (#23665) 2023-02-18 03:26:41 +01:00
.rubocop_todo.yml Autofix Rubocop RSpec/EmptyLineAfterHook (#23718) 2023-02-19 14:54:34 +09:00
.ruby-gemset Make Mastodon use its own gemset (#17858) 2022-08-13 15:44:34 +02:00
.ruby-version Upgrade to Ruby 3.2 (#22928) 2023-02-15 08:30:27 +01:00
.slugignore
.yarnclean
app.json Make enable_starttls configurable by envvars (#20321) 2022-11-10 21:06:21 +01:00
Aptfile Remove packages that are provided by Heroku stacks (#19836) 2022-12-15 18:55:29 +01:00
AUTHORS.md Update AUTHORS.md (#20630) 2022-11-14 08:33:24 +01:00
babel.config.js
Capfile
CHANGELOG.md Update changelog (#23515) 2023-02-10 22:48:49 +01:00
CODE_OF_CONDUCT.md Merge branch 'main' into glitch-soc/merge-upstream 2022-12-21 15:59:39 +01:00
config.ru Apply Rubocop Style/RedundantConstantBase (#23463) 2023-02-18 04:30:03 +01:00
CONTRIBUTING.md Add links to glitch-soc's Crowdin (#2033) 2022-12-21 23:49:08 +01:00
crowdin-glitch.yml Add crowdin configuration file (#2030) 2022-12-21 22:13:22 +01:00
crowdin.yml
docker-compose.yml Update docker-compose.yml (#19063) 2022-08-27 17:40:46 +02:00
Dockerfile Upgrade to Ruby 3.2 (#22928) 2023-02-15 08:30:27 +01:00
FEDERATION.md
Gemfile Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
Gemfile.lock Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
ide-helper.js
jest.config.js Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
jsconfig.json Correct prettier calls for YML/JSON (#21832) 2022-12-03 12:05:35 +09:00
LICENSE
package.json Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
postcss.config.js Remove object-fit polyfill for the old Microsoft Edge (#22693) 2023-01-05 13:32:02 +01:00
priv-config
Procfile
Procfile.dev
Rakefile
README.md Update README.md (#23409) 2023-02-07 01:23:21 +01:00
scalingo.json Make enable_starttls configurable by envvars (#20321) 2022-11-10 21:06:21 +01:00
SECURITY.md Update SECURITY.md (#23545) 2023-02-13 04:58:56 +01:00
stylelint.config.js Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
Vagrantfile Merge branch 'main' into glitch-soc/merge-upstream 2022-12-07 09:03:42 +01:00
yarn.lock Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00

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?