help me my masotodon ate a calckey and now it has reactions qts and stuff

Go to file

Claire 221580a3af Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `app/controllers/home_controller.rb`: Upstream made it so `/web` is available to non-logged-in users and `/` redirects to `/web` instead of `/about`. Kept our version since glitch-soc's WebUI doesn't have what's needed yet and I think /about is still a much better landing page anyway. - `app/models/form/admin_settings.rb`: Upstream added new settings, and glitch-soc had an extra setting. Not really a conflict. Added upstream's new settings. - `app/serializers/initial_state_serializer.rb`: Upstream added a new `server` initial state object. Not really a conflict. Merged upstream's changes. - `app/views/admin/settings/edit.html.haml`: Upstream added new settings. Not really a conflict. Merged upstream's changes. - `app/workers/scheduler/feed_cleanup_scheduler.rb`: Upstream refactored that part and removed the file. Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb` - `config/settings.yml`: Upstream added new settings. Not a real conflict. Added upstream's new settings.		2 years ago
.circleci	Revamp post filtering system (#18058 )	2 years ago
.devcontainer	Fix auto detect language for translate service (#19244 )	2 years ago
.github	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
app	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
bin	Update Mastodon to Rails 6.1 (#15910 )	4 years ago
chart	Mark job pods not to use Istio's envoy sidecar (#18415 )	2 years ago
config	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
db	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
dist	Also compress SVG and ICO images in nginx (#17651 )	3 years ago
lib	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
log	Initial commit	9 years ago
public	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
spec	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
streaming	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
vendor	Increase files checked by ESLint (#9705 )	6 years ago
.browserslistrc	Add ES6 compatibility to browserslist (#18519 )	2 years ago
.buildpacks	Remove nodejs buildpack from buildpacks (#14364 )	4 years ago
.codeclimate.yml	Replace from Code Climate to Super-Linter (#18587 )	2 years ago
.deepsource.toml	Update .deepsource.toml (#15753 )	4 years ago
.dockerignore	Update .dockerignore/.gitignore for #16947 etc (#17099 )	3 years ago
.editorconfig	Add final newline to locale files (#2890 )	8 years ago
.env.production.sample	Change default values for emoji limits in .env.production.sample and comment them out	2 years ago
.env.test	Bump webpacker from 4.0.7 to 4.2.0 (#12416 )	5 years ago
.env.vagrant	Add a default DB_HOST to .env.vagrant for enable the streaming (#14030 )	4 years ago
.eslintignore	Increase files checked by ESLint (#9705 )	6 years ago
.eslintrc.js	Replace from Code Climate to Super-Linter (#18587 )	2 years ago
.foreman	Replace sprockets/browserify with Webpack (#2617 )	8 years ago
.gitattributes	Add .gitattributes file to avoid unwanted CRLF (#3954 )	7 years ago
.gitignore	Update .dockerignore/.gitignore for #16947 etc (#17099 )	3 years ago
.gitmodules	Rename themes -> flavours ? ?	7 years ago
.haml-lint.yml	Added haml-lint and fix warnings (#2773 )	8 years ago
.nanoignore	Remove Storybook (#4397 )	7 years ago
.nvmrc	NodeJS 14 support - circleci/docker/.nvmrc (#16163 )	3 years ago
.prettierignore	Format JSON and YAML using Prettier (#17823 )	3 years ago
.prettierrc.js	Format JSON and YAML using Prettier (#17823 )	3 years ago
.profile	Add ffmpeg and dependent packages as well as LD_LIBRARY_PATHs (#3276 )	8 years ago
.rspec	Adding a Mention model, test stubs	9 years ago
.rubocop.yml	Add customizable user roles (#18641 )	2 years ago
.ruby-gemset	Make Mastodon use its own gemset (#17858 )	2 years ago
.ruby-version	Bump Ruby version from 3.0.3 to 3.0.4 (#18028 )	2 years ago
.slugignore	Remove Storybook (#4397 )	7 years ago
.yarnclean	Replace from scss-lint to sass-lint (#10958 )	6 years ago
AUTHORS.md	Bump version to 3.5.0rc1 (#17618 )	3 years ago
Aptfile	Remove protobuf dependencies (#17539 )	3 years ago
CHANGELOG.md	Bump version to 3.5.3 (#18530 )	2 years ago
CODE_OF_CONDUCT.md	Change e-mail contact for CoC enforcement	6 years ago
CONTRIBUTING.md	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Capfile	remove capistrano/faster_assets from Capfile (#2737 )	8 years ago
Dockerfile	Install python3 when building with Docker (#18072 )	2 years ago
FEDERATION.md	Add FEDERATION.md (#17029 )	3 years ago
Gemfile	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
Gemfile.lock	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
LICENSE	Fix #49 - License changed from GPL-2.0 to AGPL-3.0	8 years ago
Procfile	fix: make Procfile compatible with herokuish (#12685 )	4 years ago
Procfile.dev	Set RAILS_ENV in Procfile.dev (#15502 )	4 years ago
README.md	Drop support for Ruby v2.5 and Node.js v12 (#18323 )	2 years ago
Rakefile	Initial commit	9 years ago
SECURITY.md	Remove 3.3.x from supported versions in security policy (#18516 )	2 years ago
Vagrantfile	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
app.json	Format JSON and YAML using Prettier (#17823 )	3 years ago
babel.config.js	Remove dependency for @babel/plugin-proposal-class-properties (#16155 )	4 years ago
config.ru	Fix rubocop issues, introduce usage of frozen literal to improve performance	8 years ago
crowdin.yml	Prevent translations from accidentally becoming completely different from source strings on Crowdin without translators noticing. (#17085 )	3 years ago
docker-compose.yml	Update docker-compose.yml (#19063 )	2 years ago
ide-helper.js	Add JS IDE helper (#13012 )	5 years ago
jest.config.js	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
package.json	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
postcss.config.js	Increase files checked by ESLint (#9705 )	6 years ago
priv-config	TOR federation (#7875 )	6 years ago
scalingo.json	Format JSON and YAML using Prettier (#17823 )	3 years ago
stylelint.config.js	Replace from Code Climate to Super-Linter (#18587 )	2 years ago
yarn.lock	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago

README.md

Mastodon Glitch Edition

Now with automated deploys!

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?

You can view documentation for this project at glitch-soc.github.io/docs/.
And contributing guidelines are available here and here.