Somewhat experimental and sporadically maintained fork of a fork of a fork of Mastodon https://girldick.gay
Find a file
Jeremy Kescher 4a6cc45f9d
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	Gemfile
#	Gemfile.lock
#	config/sidekiq.yml
2023-02-18 22:38:53 +01:00
.circleci Sync Node.js to 16.19 patch release (#23554) 2023-02-13 04:58:37 +01:00
.devcontainer Install SSH server into devcontainer image (#22679) 2023-01-05 13:32:59 +01:00
.github Merge remote-tracking branch 'upstream/main' into develop 2023-02-17 00:26:21 +01:00
app Merge remote-tracking branch 'upstream/main' into develop 2023-02-18 22:38:53 +01:00
bin Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
chart helm: cleanup helm chart, now in mastodon/chart (#21801) 2022-12-09 06:36:29 +01:00
config Merge remote-tracking branch 'upstream/main' into develop 2023-02-18 22:38:53 +01:00
db Merge remote-tracking branch 'upstream/main' into develop 2023-01-18 22:29:27 +01:00
dist Apparently, the segfaults were not jemalloc's fault. 2022-11-11 21:19:56 +01:00
lib Merge remote-tracking branch 'upstream/main' into develop 2023-02-18 22:38:53 +01:00
log
public Merge remote-tracking branch 'upstream/main' into develop 2023-01-05 23:29:53 +01:00
spec Merge remote-tracking branch 'upstream/main' into develop 2023-02-18 22:38:53 +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 Remove nodejs buildpack from buildpacks (#14364) 2020-07-20 09:48:10 +02:00
.codeclimate.yml Replace from Code Climate to Super-Linter (#18587) 2022-06-01 19:22:35 +02:00
.dockerignore Update .dockerignore/.gitignore for #16947 etc (#17099) 2021-12-06 18:04:04 +01:00
.editorconfig Enable EditorConfig trailing whitespace trimming (#23543) 2023-02-12 08:34:17 +01:00
.env.production.catcatnya Update CatCatNya .env file 2022-12-17 12:12:45 +01:00
.env.production.sample make number of displayed reactions a setting 2022-12-20 18:25:43 +01:00
.env.test Bump webpacker from 4.0.7 to 4.2.0 (#12416) 2019-11-20 17:56:11 +01:00
.env.vagrant Add a default DB_HOST to .env.vagrant for enable the streaming (#14030) 2020-06-15 01:57:06 +02:00
.eslintignore
.eslintrc.js Enable ESLint import recommended rules (#23315) 2023-02-13 15:12:31 +01: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 [Glitch] Upgrade to Stylelint 15 with Prettier 2023-02-18 16:02:12 +01:00
.prettierrc.js Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
.profile
.rspec
.rubocop.yml Run Prettier on YML files (#22345) 2022-12-16 11:11:52 +09:00
.ruby-gemset Make Mastodon use its own gemset (#17858) 2022-08-13 15:44:34 +02:00
.ruby-version Update Ruby to 3.0.5 (#23544) 2023-02-13 14:39:24 +01:00
.slugignore
.yarnclean Replace from scss-lint to sass-lint (#10958) 2019-06-04 17:23:18 +02:00
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 Remove dependency for @babel/plugin-proposal-class-properties (#16155) 2021-05-04 23:13:04 +02:00
Capfile
CHANGELOG.md Update changelog (#23515) 2023-02-10 22:48:49 +01:00
CODE_OF_CONDUCT.md Merge branch 'reactions' into develop 2022-12-22 00:18:36 +01:00
config.ru Apply Rubocop Style/ExpandPathArguments (#23450) 2023-02-08 07:06:20 +01:00
CONTRIBUTING.md Merge remote-tracking branch 'upstream/main' into develop 2023-01-05 23:29:53 +01:00
crowdin-glitch.yml Add crowdin configuration file (#2030) 2022-12-21 22:13:22 +01:00
crowdin.yml Prevent translations from accidentally becoming completely different from source strings on Crowdin without translators noticing. (#17085) 2021-12-01 19:03:35 +01:00
docker-compose.yml Update docker-compose.yml (#19063) 2022-08-27 17:40:46 +02:00
Dockerfile Update Ruby to 3.0.5 (#23544) 2023-02-13 14:39:24 +01:00
FEDERATION.md Add FEDERATION.md (#17029) 2021-11-23 00:15:31 +01:00
Gemfile Update and fix dependencies 2023-02-17 00:29:06 +01:00
Gemfile.lock Merge remote-tracking branch 'upstream/main' into develop 2023-02-18 22:38:53 +01:00
ide-helper.js Add JS IDE helper (#13012) 2020-04-27 17:19:53 +02:00
jest.config.js Merge branch 'main' into glitch-soc/merge-upstream 2022-05-04 19:15:50 +02: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-13 19:35:35 +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 fix: make Procfile compatible with herokuish (#12685) 2020-08-29 19:00:30 +02:00
Procfile.dev Set RAILS_ENV in Procfile.dev (#15502) 2021-01-07 09:30:12 +01:00
Rakefile
README.md Update README.md (#23409) 2023-02-07 01:23:21 +01:00
redact-env.bash Add redacted CatCatNya~ production env file. 2022-06-27 00:11:33 +02: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-13 19:35:35 +01:00

Catstodon

Introduction

This Mastodon fork is based on the glitch-soc Fork of Mastodon, with changes made to suit CatCatNya~. The aforementioned instance is running the develop branch. I intend to contribute some useful differences back to glitch-soc and vanilla Mastodon.

To install, take a look at glitch-soc.github.io/docs/. The instructions and features are the same, except for the differences outlined below.

Contributing guidelines are available here.

Note: CatCatNya~ runs on the develop branch. That branch may, at times, be force-pushed to (mostly for undoing cherry-picking of vanilla commits when upstream adopts them). I highly suggest only ever running the main branch in production!

Differences

  • Some files are adjusted specifically for the CatCatNya~ instance. Specifically, these:
    • sounds/boop.mp3
    • sounds/boop.ogg
      You might want to revert these to the upstream files (or your own versions!) if you decide to use this fork for your own instance.
  • The web frontend emoji picker is a blobcat instead of the joy emoji.
  • The rate limits for authenticated users have been relaxed a bit.
  • The API endpoint /api/v1/custom_emojis is no longer affected by AUTHORIZED_FETCH, allowing anyone to copy custom emojis.
  • Allow higher resolution images. (4096x4096 instead of the previous limit of 1920x1080)
  • Allow posting polls with only one poll option (if MIN_POLL_OPTIONS is set to 1 on your instance).
  • Added oatstodon flavour (taken from types.pl fork, by @oat@hellsite.site)
  • Emoji reactions on posts, a feature originally developed for Nyastodon. Currently pending merge into glitch-soc.

Previous differences now merged into glitch-soc

  • Fixed incorrect upload size limit display when adding new a new custom emoji. (Pull request)
  • Everything merged into vanilla Mastodon

Previous differences now merged into vanilla Mastodon

  • The period of retention of IP addresses and sessions was made configurable. (Pull request)