Local mirror of Catstodon, for girldick.gay's nyastodon fork
You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 
Go to file
Claire 21e7a53ca5 Merge commit '3b3144740805c1b404934c0f196d6cddc14dac0b' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Conflict due to lines adjacent to the glitch-soc-modified `i18n:extract` one
  were changed, but otherwise no real conflict.
  Ported upstream's changes and kept glitch-soc's `i18n:extract`.
- `tsconfig.json`:
  Upstream's dependencies changed the code style rules for json formatting, and
  we had local changes.
  Kept our changes, but with upstream's formatting/
- `yarn.lock`:
  A dependency textually adjacent to a glitch-soc-only one got changed.
  Applied upstream's change, keeping the glitch-soc-only dependency.
3 months ago
.devcontainer Update devDependencies (non-major) (#29089) 3 months ago
.github Merge commit '3b3144740805c1b404934c0f196d6cddc14dac0b' into glitch-soc/merge-upstream 3 months ago
.husky Update husky and remove deprecated features (#29338) 3 months ago
.yarn Replace our custom `compression-webpack-plugin` patch with the fixed upstream version (#28510) 5 months ago
app Merge commit '3b3144740805c1b404934c0f196d6cddc14dac0b' into glitch-soc/merge-upstream 3 months ago
bin Handle CLI failure exit status at the top-level script (#28322) 4 months ago
chart helm: cleanup helm chart, now in mastodon/chart (#21801) 1 year ago
config Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream 3 months ago
db Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream 3 months ago
dist Add suggestion for secure cyphers to nginx.conf (#26349) 9 months ago
lib Merge commit 'cfa71a4d16e71b04a42dda564ed8e188bd1badd9' into glitch-soc/merge-upstream 3 months ago
log
public Merge commit '899eac1a92c802c334606a49d538ef37bd47c91a' into glitch-soc/merge-upstream 3 months ago
spec Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream 3 months ago
streaming Merge commit '3b3144740805c1b404934c0f196d6cddc14dac0b' into glitch-soc/merge-upstream 3 months ago
vendor Increase files checked by ESLint (#9705) 5 years ago
.browserslistrc Add ES6 compatibility to browserslist (#18519) 2 years ago
.buildpacks Remove nodejs buildpack from buildpacks (#14364) 4 years ago
.bundler-audit.yml Ignore the devise-two-factor advisory as we have rate limits in place (#28733) 4 months ago
.dockerignore Do not copy `public/packs-test` into Docker (#27736) 6 months ago
.editorconfig Enable EditorConfig trailing whitespace trimming (#23543) 1 year ago
.env.production.sample Add env variable support for number of followable hashtags in feed column (#2500) 3 months ago
.env.test Improve Babel configuration and automatically load polyfills (#27333) 7 months ago
.env.vagrant Add elastic search installation into Vagrantfile (#26512) 9 months ago
.eslintignore Increase files checked by ESLint (#9705) 5 years ago
.eslintrc.js Merge commit '3b3144740805c1b404934c0f196d6cddc14dac0b' into glitch-soc/merge-upstream 3 months ago
.foreman Replace sprockets/browserify with Webpack (#2617) 7 years ago
.gitattributes Add .gitattributes file to avoid unwanted CRLF (#3954) 7 years ago
.gitignore Upgrade to Yarn 4, remove support for Node 16 (#27073) 6 months ago
.gitmodules Rename themes -> flavours ? ? 7 years ago
.haml-lint.yml Update haml-lint line length configuration to match rubocop value (#27570) 7 months ago
.haml-lint_todo.yml Fix `LineLength` haml-lint in `media/player` view (#28667) 4 months ago
.nanoignore Remove Storybook (#4397) 7 years ago
.nvmrc Update dependency node to 20.11 (#28670) 4 months ago
.prettierignore Merge commit '3b3144740805c1b404934c0f196d6cddc14dac0b' into glitch-soc/merge-upstream 3 months ago
.prettierrc.js
.profile Make it possible to upload audio and video to Heroku app (#24866) 1 year ago
.rspec Adding a Mention model, test stubs 8 years ago
.rubocop.yml Re-enable fixed `Style/Semicolon` cop (#29212) 3 months ago
.rubocop_todo.yml Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream 3 months ago
.ruby-gemset Make Mastodon use its own gemset (#17858) 2 years ago
.ruby-version Use ruby version 3.2.3 (#28817) 4 months ago
.simplecov Disable simplecov `enable_coverage_for_eval` option, move to standalone file (#27869) 6 months ago
.slugignore Remove Storybook (#4397) 7 years ago
.watchmanconfig Fix Jest config (#27834) 6 months ago
.yarnrc.yml Upgrade to Yarn 4, remove support for Node 16 (#27073) 6 months ago
AUTHORS.md Update AUTHORS.md (#27018) 8 months ago
Aptfile Make it possible to upload audio and video to Heroku app (#24866) 1 year ago
CHANGELOG.md Bump version to v4.3.0-alpha.3 (#29241) 3 months ago
CODE_OF_CONDUCT.md Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
CONTRIBUTING.md Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream 5 months ago
Dockerfile Use ruby version 3.2.3 (#28817) 4 months ago
FEDERATION.md docs: update FEDERATION.md to more closely follow FEP conventions. (#28838) 4 months ago
Gemfile Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream 3 months ago
Gemfile.lock Update dependency thor to v1.3.1 (#29421) 3 months 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 Split streaming server from web server (#24702) 6 months ago
README.md Fix glitch-soc Markdown linting issues (#2168) 1 year ago
Rakefile Run Rubocop on Rakefile (#23871) 10 months ago
SECURITY.md Remove v3.5 branch from supported Mastodon versions (#28574) 5 months ago
Vagrantfile Change Vagrant to install Node 20 (#28100) 6 months ago
app.json Make enable_starttls configurable by envvars (#20321) 2 years ago
babel.config.js Disable Babel polyfill injection in dev (#27691) 6 months ago
config.ru Autofix Rubocop remaining Layout rules (#23679) 1 year ago
crowdin-glitch.yml Fix Crowdin Github Action (#2311) 10 months ago
crowdin.yml Add a Github Action to send translations to Crowdin for each merge in main (#25869) 10 months ago
docker-compose.yml Bump version to v4.3.0-alpha.3 (#29241) 3 months ago
ide-helper.js
jest.config.js Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream 4 months ago
jsconfig.json Update devDependencies (non-major) (#29089) 3 months ago
lint-staged.config.js Improve `lint-staged` config (#28704) 4 months ago
package.json Merge commit '3b3144740805c1b404934c0f196d6cddc14dac0b' into glitch-soc/merge-upstream 3 months ago
postcss.config.js
priv-config TOR federation (#7875) 6 years ago
scalingo.json Add S3 region list reference to Scalingo config (#24152) 1 year ago
stylelint.config.js
tsconfig.json Merge commit '3b3144740805c1b404934c0f196d6cddc14dac0b' into glitch-soc/merge-upstream 3 months ago
yarn.lock Merge commit '3b3144740805c1b404934c0f196d6cddc14dac0b' into glitch-soc/merge-upstream 3 months ago

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?