mirror of https://github.com/glitch-soc/mastodon.git synced 2025-03-17 17:00:45 -04:00

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.

2023-12-20 22:16:50 +01:00

.devcontainer

Fix devcontainer by not forcing NODE_ENV (#28099 )

2023-11-28 14:47:32 +00:00

.github

Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream

2023-12-20 22:16:50 +01:00

.husky

Use Yarn instead of NPX for pre-commit hook (#24287 )

2023-03-28 06:28:57 +02:00

.yarn

Upgrade to Yarn 4, remove support for Node 16 (#27073 )

2023-11-08 10:57:21 +00:00

app

Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream

2023-12-20 22:16:50 +01:00

bin

Move the mastodon/*_cli files to mastodon/cli/* (#24139 )

2023-05-23 16:08:26 +02:00

chart

helm: cleanup helm chart, now in mastodon/chart (#21801 )

2022-12-09 06:36:29 +01:00

config

Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream

2023-12-20 22:16:50 +01:00

Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream

2023-12-20 22:16:50 +01:00

dist

Add suggestion for secure cyphers to nginx.conf (#26349 )

2023-08-31 12:17:10 +02:00

lib

Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream

2023-12-20 22:16:50 +01:00

log

Initial commit

2016-02-20 22:53:20 +01:00

public

Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main

2023-08-13 18:47:15 +02:00

spec

Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream

2023-12-20 22:16:50 +01:00

streaming

Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream

2023-12-20 20:10:45 +01:00

vendor

Increase files checked by ESLint (#9705 )

2019-01-04 11:28:38 +01:00

.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

.dockerignore

Do not copy public/packs-test into Docker (#27736 )

2023-11-07 09:22:04 +00:00

.editorconfig

Enable EditorConfig trailing whitespace trimming (#23543 )

2023-02-12 08:34:17 +01:00

.env.production.sample

Merge branch 'main' into glitch-soc/merge-upstream

2022-12-15 20:25:25 +01:00

.env.test

Improve Babel configuration and automatically load polyfills (#27333 )

2023-10-31 10:55:13 +00:00

.env.vagrant

Add elastic search installation into Vagrantfile (#26512 )

2023-08-23 15:46:14 +02:00

.eslintignore

Increase files checked by ESLint (#9705 )

2019-01-04 11:28:38 +01:00

.eslintrc.js

Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream

2023-12-20 22:16:50 +01:00

.foreman

Replace sprockets/browserify with Webpack (#2617 )

2017-05-03 02:04:16 +02:00

.gitattributes

Add .gitattributes file to avoid unwanted CRLF (#3954 )

2017-06-26 13:15:24 +02:00

.gitignore

Upgrade to Yarn 4, remove support for Node 16 (#27073 )

2023-11-08 10:57:21 +00:00

.gitmodules

Rename themes -> flavours ? ?

2017-12-03 23:26:40 -08:00

.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

Remove Storybook (#4397 )

2017-07-27 22:30:27 +02:00

.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

Use Prettier for ESLint formatting TypeScript (#23631 )

2023-05-09 19:02:12 +02:00

.profile

Make it possible to upload audio and video to Heroku app (#24866 )

2023-05-05 14:41:07 +02:00

.rspec

Adding a Mention model, test stubs

2016-02-25 00:17:01 +01:00

.rubocop_todo.yml

Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream

2023-12-20 22:16:50 +01:00

.rubocop.yml

Fix RSpec/SpecFilePathFormat cops (#27730 )

2023-11-06 16:25:40 +00:00

.ruby-gemset

Make Mastodon use its own gemset (#17858 )

2022-08-13 15:44:34 +02:00

.ruby-version

Bump ruby to 3.2.2 due to ReDoS vulnerabilities (#24320 )

2023-03-31 18:28:40 +02:00

.simplecov

Disable simplecov enable_coverage_for_eval option, move to standalone file (#27869 )

2023-11-15 23:09:31 +00:00

.slugignore

Remove Storybook (#4397 )

2017-07-27 22:30:27 +02:00

.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

Make enable_starttls configurable by envvars (#20321 )

2022-11-10 21:06:21 +01:00

Aptfile

Make it possible to upload audio and video to Heroku app (#24866 )

2023-05-05 14:41:07 +02:00

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

Merge branch 'main' into glitch-soc/merge-upstream

2023-02-25 14:00:40 +01:00

config.ru

Autofix Rubocop remaining Layout rules (#23679 )

2023-02-20 06:58:28 +01:00

CONTRIBUTING.md

Fix glitch-soc Markdown linting issues (#2168 )

2023-04-08 17:23:24 +02:00

crowdin-glitch.yml

Fix Crowdin Github Action (#2311 )

2023-07-19 08:36:25 +02:00

crowdin.yml

Add a Github Action to send translations to Crowdin for each merge in main (#25869 )

2023-07-18 16:56:01 +02:00

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 '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream

2023-12-20 22:16:50 +01:00

Gemfile.lock

Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream

2023-12-20 20:10:45 +01:00

ide-helper.js

Add JS IDE helper (#13012 )

2020-04-27 17:19:53 +02:00

jest.config.js

Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream

2023-12-18 19:10:43 +01:00

jsconfig.json

Correct prettier calls for YML/JSON (#21832 )

2022-12-03 12:05:35 +09:00

LICENSE

Fix #49 - License changed from GPL-2.0 to AGPL-3.0

2016-09-21 23:04:34 +02:00

package.json

Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream

2023-12-20 22:16:50 +01:00

postcss.config.js

Update PostCSS dependencies (#23835 )

2023-03-15 04:01:10 +01:00

priv-config

TOR federation (#7875 )

2018-06-26 20:34:12 +02:00

Procfile

fix: make Procfile compatible with herokuish (#12685 )

2020-08-29 19:00:30 +02:00

Procfile.dev

Split streaming server from web server (#24702 )

2023-11-14 17:43:20 +00:00

Rakefile

Run Rubocop on Rakefile (#23871 )

2023-07-12 09:47:54 +02:00

README.md

Upgrade to Yarn 4, remove support for Node 16 (#27073 )

2023-11-08 10:57:21 +00:00

scalingo.json

Add S3 region list reference to Scalingo config (#24152 )

2023-04-26 16:46:19 +02:00

SECURITY.md

Mark version 4.0 as no longer supported (#27627 )

2023-11-01 13:53:14 +00:00

stylelint.config.js

Merge branch 'main' into glitch-soc/merge-upstream

2023-04-29 10:44:56 +02:00

tsconfig.json

Fix interaction modal being broken because of glitch-soc's theming system

2023-07-30 16:45:50 +02:00

Vagrantfile

Change Vagrant to install Node 20 (#28100 )

2023-11-30 10:46:06 +00:00

yarn.lock

Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream

2023-12-20 22:16:50 +01:00

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.

Languages

Ruby 49.3%

JavaScript 24.5%

TypeScript 14.8%

SCSS 7.6%

Haml 3.4%

Other 0.4%