1
0
A YuruToot variation in Fediverse https://puyopuyotetr.is
Go to file
Claire 75580360cd Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream
Conflicts:
- `.rubocop_todo.yml`:
  Upstream fixed a bunch lint issues, and changed the `Max` parameter of the
  `Metrics/AbcSize` cop.
  Glitch-soc has different code and slightly higher `AbcSize` complexity,
  modified the `.rubocop_todo.yml` file accordingly.
- `app/policies/status_policy.rb`:
  Upstream changed `account.suspended?` to `account.unavailable?` to prepare
  for delete flags. Glitch-soc has additional local-only conditions.
  Ported upstream's refactor while keeping glitch-soc's additional condition.
- `app/serializers/initial_state_serializer.rb`:
  Upstream refactored a bunch of stuff while glitch-soc has more settings.
  Refactored as upstream did while keeping glitch-soc's settings.
2023-12-20 22:05:31 +01:00
.devcontainer Fix devcontainer by not forcing NODE_ENV (#28099) 2023-11-28 14:47:32 +00:00
.github Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 2023-12-20 20:10:45 +01:00
.husky
.yarn Upgrade to Yarn 4, remove support for Node 16 (#27073) 2023-11-08 10:57:21 +00:00
app Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream 2023-12-20 22:05:31 +01:00
bin
chart
config Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream 2023-12-20 21:58:18 +01:00
db Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream 2023-12-18 19:10:43 +01:00
dist
lib Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream 2023-12-20 22:05:31 +01:00
log
public
spec Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream 2023-12-20 22:05:31 +01:00
streaming Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 2023-12-20 20:10:45 +01:00
vendor
.browserslistrc
.buildpacks
.dockerignore Do not copy public/packs-test into Docker (#27736) 2023-11-07 09:22:04 +00:00
.editorconfig
.env.production.sample
.env.test Improve Babel configuration and automatically load polyfills (#27333) 2023-10-31 10:55:13 +00:00
.env.vagrant
.eslintignore
.eslintrc.js Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 2023-12-20 20:10:45 +01:00
.foreman
.gitattributes
.gitignore Upgrade to Yarn 4, remove support for Node 16 (#27073) 2023-11-08 10:57:21 +00:00
.gitmodules
.haml-lint_todo.yml Consolidate html page title output logic into helper (#27563) 2023-11-09 13:05:57 +00:00
.haml-lint.yml Update haml-lint line length configuration to match rubocop value (#27570) 2023-10-31 09:47:16 +00:00
.nanoignore
.nvmrc Update dependency node to 20.9 (#27534) 2023-10-25 07:16:19 +00:00
.prettierignore Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream 2023-10-08 17:30:48 +02:00
.prettierrc.js
.profile
.rspec
.rubocop_todo.yml Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream 2023-12-20 22:05:31 +01:00
.rubocop.yml Fix RSpec/SpecFilePathFormat cops (#27730) 2023-11-06 16:25:40 +00:00
.ruby-gemset
.ruby-version
.simplecov Disable simplecov enable_coverage_for_eval option, move to standalone file (#27869) 2023-11-15 23:09:31 +00:00
.slugignore
.watchmanconfig Fix Jest config (#27834) 2023-11-13 12:19:41 +00:00
.yarnrc.yml Upgrade to Yarn 4, remove support for Node 16 (#27073) 2023-11-08 10:57:21 +00:00
app.json
Aptfile
AUTHORS.md Update AUTHORS.md (#27018) 2023-09-21 14:42:15 +02:00
babel.config.js Disable Babel polyfill injection in dev (#27691) 2023-11-06 10:24:41 +00:00
CHANGELOG.md Prune the changelog of older entries (#27432) 2023-10-23 14:35:56 +02:00
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md
crowdin-glitch.yml
crowdin.yml
docker-compose.yml Change startup command for Puma in Docker Compose (#28138) 2023-12-01 11:06:37 +00:00
Dockerfile Fix mastodon user not being owner of tmp folder in Dockerfile (#28137) 2023-11-30 16:11:21 +00:00
FEDERATION.md Update FEDERATION.md (#26819) 2023-09-06 16:28:31 +02:00
Gemfile Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream 2023-12-19 20:51:37 +01:00
Gemfile.lock Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 2023-12-20 20:10:45 +01:00
ide-helper.js
jest.config.js Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream 2023-12-18 19:10:43 +01:00
jsconfig.json
LICENSE
package.json Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 2023-12-20 20:10:45 +01:00
postcss.config.js
priv-config
Procfile
Procfile.dev Split streaming server from web server (#24702) 2023-11-14 17:43:20 +00:00
Rakefile
README.md Upgrade to Yarn 4, remove support for Node 16 (#27073) 2023-11-08 10:57:21 +00:00
scalingo.json
SECURITY.md Mark version 4.0 as no longer supported (#27627) 2023-11-01 13:53:14 +00:00
stylelint.config.js
tsconfig.json
Vagrantfile Change Vagrant to install Node 20 (#28100) 2023-11-30 10:46:06 +00:00
yarn.lock Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 2023-12-20 20:10:45 +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?