Go to file

Claire 2126812f65 Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream

Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some settings, where glitch-soc has an extra setting.
  Ported upstream changes, moving the same settings as them.

2023-08-22 18:31:28 +02:00

.devcontainer

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

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

.github

Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream

2023-08-21 21:07:39 +02:00

.husky

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

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

app

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

2023-08-22 18:31:28 +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 commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream

2023-08-22 18:31:28 +02:00

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

2023-08-22 18:31:28 +02:00

dist

Make mastodon-streaming systemd unit templated (#24751 )

2023-08-07 15:41:34 +02:00

lib

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

2023-08-22 18:31:28 +02:00

log

…

public

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

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

spec

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

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

streaming

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

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

vendor

…

.browserslistrc

…

.buildpacks

…

.dockerignore

…

.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

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

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

2023-07-20 17:03:39 +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

…

.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

…

.rubocop_todo.yml

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

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

.rubocop.yml

Update rubocop rules for linelength (#26190 )

2023-07-28 23:11:45 +02:00

.ruby-gemset

…

.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

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

Prepare v4.2.0-beta1 (#26339 )

2023-08-08 16:12:12 +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

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

Bump version to v4.1.6 (#26272 )

2023-07-31 21:11:25 +02:00

Dockerfile

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

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

FEDERATION.md

…

Gemfile

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

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

Gemfile.lock

Update dependency nokogiri to v1.15.4 (#26476 )

2023-08-14 14:10:46 +02:00

ide-helper.js

…

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

…

package.json

Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream

2023-08-21 21:07:39 +02:00

postcss.config.js

Update PostCSS dependencies (#23835 )

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

priv-config

…

Procfile

…

Procfile.dev

…

Rakefile

Run Rubocop on Rakefile (#23871 )

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

README.md

Update README.md (#25435 )

2023-07-28 23:09:19 +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

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

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

Vagrantfile

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

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

yarn.lock

Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream

2023-08-21 21:07:39 +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 47.6%

JavaScript 23.7%

TypeScript 14.7%

SCSS 8.8%

Haml 3.2%

Other 2%