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 077e0c6812 Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  Conflict caused by the `json` gem thing once again.
  Updated as upstream did, but keeping the most recent `json` version.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored a bunch of specs, including one place that differs
  because of glitch-soc's theming system.
  Refactored as upstream did, adapting it for glitch-soc's theming system.
5 months ago
.devcontainer Fix devcontainer by not forcing `NODE_ENV` (#28099) 6 months ago
.github Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 5 months ago
.husky Use Yarn instead of NPX for pre-commit hook (#24287) 1 year ago
.yarn Upgrade to Yarn 4, remove support for Node 16 (#27073) 6 months ago
app Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 5 months ago
bin Move the mastodon/*_cli files to mastodon/cli/* (#24139) 1 year ago
chart helm: cleanup helm chart, now in mastodon/chart (#21801) 1 year ago
config Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 5 months ago
db Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 5 months ago
dist Add suggestion for secure cyphers to nginx.conf (#26349) 9 months ago
lib Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 5 months ago
log Initial commit 8 years ago
public Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main 9 months ago
spec Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 5 months ago
streaming Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 5 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
.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 Merge branch 'main' into glitch-soc/merge-upstream 1 year 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 '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 5 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 Consolidate html page title output logic into helper (#27563) 6 months ago
.nanoignore Remove Storybook (#4397) 7 years ago
.nvmrc Update dependency node to 20.9 (#27534) 7 months ago
.prettierignore Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream 7 months ago
.prettierrc.js Use Prettier for ESLint formatting TypeScript (#23631) 1 year ago
.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 Fix `RSpec/SpecFilePathFormat` cops (#27730) 6 months ago
.rubocop_todo.yml Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 5 months ago
.ruby-gemset Make Mastodon use its own gemset (#17858) 2 years ago
.ruby-version Bump ruby to 3.2.2 due to ReDoS vulnerabilities (#24320) 1 year 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 Prune the changelog of older entries (#27432) 7 months ago
CODE_OF_CONDUCT.md Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
CONTRIBUTING.md Fix glitch-soc Markdown linting issues (#2168) 1 year ago
Dockerfile Fix mastodon user not being owner of tmp folder in Dockerfile (#28137) 6 months ago
FEDERATION.md Update FEDERATION.md (#26819) 9 months ago
Gemfile Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 5 months ago
Gemfile.lock Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 5 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 Upgrade to Yarn 4, remove support for Node 16 (#27073) 6 months ago
Rakefile Run Rubocop on Rakefile (#23871) 10 months ago
SECURITY.md Mark version 4.0 as no longer supported (#27627) 7 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 Change startup command for Puma in Docker Compose (#28138) 6 months ago
ide-helper.js Add JS IDE helper (#13012) 4 years ago
jest.config.js Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream 5 months ago
jsconfig.json Correct prettier calls for YML/JSON (#21832) 1 year ago
package.json Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 5 months ago
postcss.config.js Update PostCSS dependencies (#23835) 1 year ago
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 Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
tsconfig.json Fix interaction modal being broken because of glitch-soc's theming system 10 months ago
yarn.lock Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 5 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?