Go to file

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

Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them.

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

.circleci

Move db migration CI to GitHub Actions (#23624 )

2023-02-19 07:06:34 +01:00

.devcontainer

Fix devcontainer.json format (#23715 )

2023-02-19 07:02:46 +01:00

.github

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

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

app

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

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

bin

Update Mastodon to Rails 6.1 (#15910 )

2021-03-24 10:44:31 +01: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-02-25 14:00:40 +01:00

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

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

dist

Fix nginx location matching (#20198 )

2022-11-09 04:12:57 +01:00

lib

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

2023-02-25 14:00:40 +01: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-02-25 14:00:40 +01:00

streaming

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

2023-02-13 19:35:35 +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

.bundler-audit.yml

Run bundler-audit on PRs (#23514 )

2023-02-18 12:49:09 +01:00

.codeclimate.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

Rename JSX files with proper .jsx extension (#23733 )

2023-02-20 03:20:59 +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

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.yml

Added haml-lint and fix warnings (#2773 )

2017-05-08 03:35:25 +02:00

.nanoignore

Remove Storybook (#4397 )

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

.nvmrc

Sync Node.js to 16.19 patch release (#23554 )

2023-02-13 04:58:37 +01:00

.prettierignore

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

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

.prettierrc.js

Format JSON and YAML using Prettier (#17823 )

2022-03-21 04:46:11 +01:00

.profile

Add ffmpeg and dependent packages as well as LD_LIBRARY_PATHs (#3276 )

2017-05-24 17:57:33 +02:00

.rspec

Adding a Mention model, test stubs

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

.rubocop_todo.yml

Remove unused HTML Validator (#23866 )

2023-02-24 20:06:32 +01:00

.rubocop.yml

Autofix Rubocop Style/RescueStandardError (#23745 )

2023-02-20 11:01:20 +01:00

.ruby-gemset

Make Mastodon use its own gemset (#17858 )

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

.ruby-version

Upgrade to Ruby 3.2 (#22928 )

2023-02-15 08:30:27 +01:00

.slugignore

Remove Storybook (#4397 )

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

.yarnclean

Replace from scss-lint to sass-lint (#10958 )

2019-06-04 17:23:18 +02:00

app.json

Make enable_starttls configurable by envvars (#20321 )

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

Aptfile

Remove packages that are provided by Heroku stacks (#19836 )

2022-12-15 18:55:29 +01:00

AUTHORS.md

Update AUTHORS.md (#20630 )

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

babel.config.js

Remove dependency for @babel/plugin-proposal-class-properties (#16155 )

2021-05-04 23:13:04 +02:00

Capfile

Autofix Rubocop remaining Layout rules (#23679 )

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

CHANGELOG.md

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

2023-02-20 07:37:28 +01: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

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

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

crowdin-glitch.yml

Add crowdin configuration file (#2030 )

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

crowdin.yml

Prevent translations from accidentally becoming completely different from source strings on Crowdin without translators noticing. (#17085 )

2021-12-01 19:03:35 +01:00

docker-compose.yml

Update docker-compose.yml (#19063 )

2022-08-27 17:40:46 +02:00

Dockerfile

Upgrade to Ruby 3.2 (#22928 )

2023-02-15 08:30:27 +01:00

FEDERATION.md

Add FEDERATION.md (#17029 )

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

Gemfile

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

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

Gemfile.lock

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

2023-02-25 14:00:40 +01: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-02-19 10:42:55 +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 branch 'main' into glitch-soc/merge-upstream

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

postcss.config.js

Remove object-fit polyfill for the old Microsoft Edge (#22693 )

2023-01-05 13:32:02 +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

Update README.md (#23409 )

2023-02-07 01:23:21 +01:00

scalingo.json

Make enable_starttls configurable by envvars (#20321 )

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

SECURITY.md

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

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

stylelint.config.js

Upgrade to Stylelint 15 with Prettier (#23558 )

2023-02-13 04:57:03 +01: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-02-25 14:00:40 +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 57.6%

JavaScript 26.6%

SCSS 10%

Haml 5.5%

HTML 0.2%