tarrien/Mastodon

Go to file

Claire 1cd7f5ff17 Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream

Conflicts:
- `.eslintrc.js`:
  Upstream moved a configuration block in which we had added a glitch-only
  path.
  Moved the configuration block as upstream did.
- other files:
  Upstream reordered imports, and those files had different ones.
  Kept our version and reordered imports using the same rules.

2023-05-28 15:54:31 +02:00

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

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

Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream

2023-05-25 22:59:30 +02:00

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

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

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

2023-05-28 15:54:31 +02:00

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

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

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

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

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

2023-05-28 15:54:31 +02:00

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

2023-05-25 23:47:28 +02:00

Remove clustering from streaming API (#24655 )

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

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

2023-05-28 15:01:53 +02:00

…

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

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

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

2023-05-28 15:01:53 +02:00

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

2023-05-28 15:54:31 +02:00

…

.browserslistrc

Add ES6 compatibility to browserslist (#18519 )

2022-05-26 20:29:28 +02:00

.buildpacks

…

.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

…

.env.vagrant

…

.eslintignore

…

.eslintrc.js

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

2023-05-28 15:54:31 +02:00

.foreman

…

.gitattributes

…

.gitignore

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

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

.gitmodules

…

.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

…

.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

…

.rubocop_todo.yml

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

2023-05-28 15:01:53 +02:00

.rubocop.yml

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

2023-05-23 16:08:26 +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

…

.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

Use the new JSX transform (#25064 )

2023-05-23 10:52:27 +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

Fix minor typos in comments and spec names (#21831 )

2023-05-19 17:13:29 +02:00

FEDERATION.md

Add FEDERATION.md (#17029 )

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

Gemfile

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

2023-05-25 23:47:28 +02:00

Gemfile.lock

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

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

ide-helper.js

…

jest.config.js

Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream

2023-05-25 22:59:30 +02:00

jsconfig.json

Correct prettier calls for YML/JSON (#21832 )

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

LICENSE

…

package.json

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

2023-05-25 23:47:28 +02:00

postcss.config.js

Update PostCSS dependencies (#23835 )

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

priv-config

…

Procfile

…

Procfile.dev

…

Rakefile

…

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

Merge commit '8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7' into glitch-soc/merge-upstream

2023-05-28 13:55:30 +02:00

Vagrantfile

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

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

yarn.lock

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

2023-05-25 23:47:28 +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 57.6%

JavaScript 26.6%

SCSS 10%

Haml 5.5%

HTML 0.2%