Go to file

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

Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  had a different lambda due to its theming system.
  Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  removed some code just after the lambda.
  Applied the same code style changes.

2023-07-17 19:02:23 +02:00

.devcontainer

Update mcr.microsoft.com/devcontainers/ruby Docker tag to v1 (#25613 )

2023-06-27 11:28:07 +02:00

.github

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

2023-07-17 19:02:23 +02:00

.husky

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

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

app

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

2023-07-17 19:02:23 +02: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 branch 'main' into glitch-soc/merge-upstream

2023-07-17 12:52:15 +02:00

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

2023-07-13 13:35:15 +02:00

dist

Add hardened headers to user-uploaded files (#25756 )

2023-07-06 14:31:37 +02:00

lib

Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream

2023-07-12 16:03:05 +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 branch 'main' into glitch-soc/merge-upstream

2023-07-17 19:02:23 +02:00

streaming

Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream

2023-06-18 10:36:14 +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

Add eslint rule to forbid vanilla imports in glitch (#2293 )

2023-07-13 21:36:23 +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 haml-lint Rubocop Style/SlicingWithRange cop (#25947 )

2023-07-17 18:18:13 +02:00

.haml-lint.yml

Consistently use middle dot (·) instead of bullet (•) to separate items (#25248 )

2023-06-02 19:58:18 +02: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 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream

2023-06-10 15:32:29 +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 branch 'main' into glitch-soc/merge-upstream

2023-07-17 12:52:15 +02:00

.rubocop.yml

Run Rubocop on Rakefile (#23871 )

2023-07-12 09:47:54 +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

Update babel monorepo to v7.22.5 (#25405 )

2023-06-14 09:22:54 +02:00

Capfile

Autofix Rubocop remaining Layout rules (#23679 )

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

CHANGELOG.md

Fix changelog referencing wrong API version (#25857 )

2023-07-11 14:53:58 +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

Update Crowdin configuration file

2023-06-30 16:22:40 +02: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 '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream

2023-07-13 13:35:15 +02:00

Gemfile.lock

Update dependency public_suffix to v5.0.3 (#26032 )

2023-07-17 12:40:54 +02:00

ide-helper.js

Add JS IDE helper (#13012 )

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

jest.config.js

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

2023-06-10 15:32:29 +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 '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream

2023-07-13 22:40:15 +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

Run Rubocop on Rakefile (#23871 )

2023-07-12 09:47:54 +02: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

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 branch 'main' into glitch-soc/merge-upstream

2023-07-17 19:02:23 +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%