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

Go to file

Claire ad1098970b Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
  Upstream merged our captcha code, but there are some
  conflicts due to glitch-soc's theming system.
- `app/views/admin/settings/registrations/show.html.haml`:
  Upstream merged our captcha code, but there are some
  conflicts due to glitch-soc's theming system.

Additional changes:
- `Gemfile`:
  Upstream added hcaptcha dependency in another place in the file.
- `config/settings.yml`:
  Upstream added the `captcha_enabled` setting in another place in the file.

2023-05-25 22:49:18 +02:00

.devcontainer

fix: remove port 80 mapping in devcontainer (#24658 )

2023-04-30 17:03:28 +09:00

.github

Upgrade uuid to 9.0.0 (#24917 )

2023-05-09 14:43:07 +02:00

.husky

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

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

app

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

2023-05-25 22:49:18 +02:00

bin

Fix sidekiq jobs not triggering Elasticsearch index updates (#24046 )

2023-03-12 23:47:55 +01:00

chart

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

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

config

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

2023-05-25 22:49:18 +02:00

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

2023-05-08 19:28:21 +02:00

dist

Remove clustering from streaming API (#24655 )

2023-04-26 11:37:51 +02:00

lib

Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream

2023-05-09 23:12:48 +02:00

log

Initial commit

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

public

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

2023-01-05 14:16:25 +01:00

spec

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

2023-05-25 22:18:55 +02:00

streaming

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

2023-05-08 15:28:36 +02: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

.bundler-audit.yml

Run bundler-audit on PRs (#23514 )

2023-02-18 12:49:09 +01: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.sample

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

2022-12-15 20:25:25 +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

Increase files checked by ESLint (#9705 )

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

.eslintrc.js

[Glitch] Add stricter ESLint rules for Typescript files

2023-05-25 21:43:19 +02: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

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

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

.gitmodules

Rename themes -> flavours ? ?

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

.haml-lint_todo.yml

Fix more haml-lint Rubocop (#24107 )

2023-03-15 20:07:43 +01:00

.haml-lint.yml

Setup haml-lint CI with todo config (#23524 )

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

.nanoignore

Remove Storybook (#4397 )

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

.nvmrc

Update Node.js to 16.20.0 (#24316 )

2023-04-07 14:26:11 +02:00

.prettierignore

Merge commit '51b83ed19536b06ce3f57b260400ecec2d1dd187' into glitch-soc/merge-upstream

2023-05-09 23:37:38 +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 '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream

2023-05-25 20:43:25 +02:00

.rubocop.yml

Fix wrong documentation link (#24924 )

2023-05-09 14:56:02 +02: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

.slugignore

Remove Storybook (#4397 )

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

.yarnclean

Setup Husky and lint-stage for commit fixing (#23308 )

2023-03-27 05:17:19 +02: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 (#20630 )

2022-11-14 08:33:24 +01:00

babel.config.js

Fixes build errors from some previous TS-related commits (#24811 )

2023-05-03 16:28:14 +02:00

Capfile

Autofix Rubocop remaining Layout rules (#23679 )

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

CHANGELOG.md

Bump version to v4.1.2 (#24427 )

2023-04-07 09:01:57 +02:00

CODE_OF_CONDUCT.md

Update Contributor Covenant to 2.1 (#23980 )

2023-04-23 23:11:50 +02: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

Add crowdin configuration file (#2030 )

2022-12-21 22:13:22 +01:00

crowdin.yml

Remove empty HTTP error translations (#24210 )

2023-04-30 17:04:15 +09:00

docker-compose.yml

Use Github Container Registry as the official container image source (#24113 )

2023-03-15 16:41:13 +01:00

Dockerfile

Fixed mastodon version injection into containers via github actions (#24858 )

2023-05-04 21:33:32 +02:00

FEDERATION.md

Add FEDERATION.md (#17029 )

2021-11-23 00:15:31 +01:00

Gemfile

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

2023-05-25 22:49:18 +02:00

Gemfile.lock

Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream

2023-05-25 20:43:25 +02: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

2023-04-22 10:06:11 +02: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 '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream

2023-05-25 20:43:25 +02: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

Set RAILS_ENV in Procfile.dev (#15502 )

2021-01-07 09:30:12 +01:00

Rakefile

Initial commit

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

README.md

Fix glitch-soc Markdown linting issues (#2168 )

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

scalingo.json

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

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

SECURITY.md

Fix Markdown files with Prettier and check in CI (#21972 )

2023-02-20 07:37:28 +01:00

stylelint.config.js

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

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

tsconfig.json

[Glitch] Add stricter ESLint rules for Typescript files

2023-05-25 21:43:19 +02:00

Vagrantfile

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

2022-12-07 09:03:42 +01:00

yarn.lock

Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream

2023-05-25 20:43:25 +02: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%