T

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

Conflicts:
- `CONTRIBUTING.md`:
  Upstream file has changed and we're quoting it.
  Ported the changes.
- `README.md`:
  Upstream file has changed but we have a completely different one.
  Kept our version.
- `lib/mastodon/version.rb`:
  Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`,
  but we're still `glitch-soc/mastodon`.
  Kept our version.
- `spec/presenters/instance_presenter_spec.rb`:
  Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`,
  but we're still `glitch-soc/mastodon`.
  Kept our version.

2021-07-13 17:57:15 +02:00

.circleci

Add Actions for check i18n (#16285 )

2021-05-22 15:00:20 +02:00

.github

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

2021-07-13 17:57:15 +02:00

app

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

2021-07-13 17:57:15 +02:00

bin

Update Mastodon to Rails 6.1 (#15910 )

2021-03-24 10:44:31 +01:00

chart

helm: upgrade elasticsearch chart to 14 (#15767 )

2021-03-12 05:39:09 +01:00

config

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

2021-07-13 17:57:15 +02:00

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

2021-07-13 17:57:15 +02:00

dist

Preload libjemalloc.so for long-running Ruby (#16462 )

2021-07-05 19:16:35 +02:00

lib

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

2021-07-13 17:57:15 +02:00

log

…

nanobox

…

public

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

2021-06-03 20:47:02 +02:00

spec

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

2021-07-13 17:57:15 +02:00

streaming

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

2021-05-07 18:21:59 +02:00

vendor

…

.buildpacks

Remove nodejs buildpack from buildpacks (#14364 )

2020-07-20 09:48:10 +02:00

.codeclimate.yml

Bump rubocop from 1.8.1 to 1.9.1 (#15677 )

2021-02-12 00:10:00 +09:00

.deepsource.toml

Update .deepsource.toml (#15753 )

2021-02-19 09:53:25 +01:00

.dockerignore

Ignore git related files from docker build (#16282 )

2021-05-22 17:43:07 +02:00

.editorconfig

…

.env.nanobox

Fix sample SAML_ACS_URL, SAML_ISSUER (#12669 )

2019-12-23 18:12:22 +01:00

.env.production.sample

Add environment variables to control custom emoji size limits

2021-04-26 11:22:22 +02:00

.env.test

…

.env.vagrant

Add a default DB_HOST to .env.vagrant for enable the streaming (#14030 )

2020-06-15 01:57:06 +02:00

.eslintignore

…

.eslintrc.js

Enable promise/catch-or-return allowFinally (#14289 )

2020-07-11 23:51:22 +02:00

.foreman

…

.gitattributes

…

.gitignore

helm: pin versions, commit lockfile (#15749 )

2021-02-19 09:56:40 +01:00

.gitmodules

…

.haml-lint.yml

…

.nanoignore

…

.nvmrc

Upgrade .nvmrc to Node.js 12 (#12906 )

2020-01-21 12:42:13 +01:00

.profile

…

.rspec

…

.rubocop.yml

Fix rubocop config and warnings (#15503 )

2021-01-07 09:40:55 +01:00

.ruby-version

Use ruby-2.7.4 (#16481 )

2021-07-10 01:29:27 +02:00

.sass-lint.yml

…

.slugignore

…

.yarnclean

…

app.json

Change references to tootsuite/mastodon to mastodon/mastodon (#16491 )

2021-07-13 15:46:20 +02:00

Aptfile

Use libvpx >= 5 (#15591 )

2021-01-22 10:09:40 +01:00

AUTHORS.md

Change references to tootsuite/mastodon to mastodon/mastodon (#16491 )

2021-07-13 15:46:20 +02:00

babel.config.js

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

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

boxfile.yml

Fix to isolate the sidekiq process that runs the scheduler job (#15314 )

2020-12-15 03:04:03 +01:00

Capfile

…

CHANGELOG.md

Change references to tootsuite/mastodon to mastodon/mastodon (#16491 )

2021-07-13 15:46:20 +02:00

CODE_OF_CONDUCT.md

…

config.ru

…

CONTRIBUTING.md

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

2021-07-13 17:57:15 +02:00

crowdin.yml

…

docker-compose.yml

Update docker-compose.yml (#16489 )

2021-07-11 12:57:31 +02:00

Dockerfile

Use ruby-2.7.4 (#16481 )

2021-07-10 01:29:27 +02:00

Gemfile

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

2021-07-11 21:41:23 +02:00

Gemfile.lock

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

2021-07-11 21:41:23 +02:00

ide-helper.js

Add JS IDE helper (#13012 )

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

LICENSE

…

package.json

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

2021-07-13 17:57:15 +02:00

postcss.config.js

…

priv-config

…

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

…

README.md

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

2021-07-13 17:57:15 +02:00

scalingo.json

Change references to tootsuite/mastodon to mastodon/mastodon (#16491 )

2021-07-13 15:46:20 +02:00

SECURITY.md

Fix security policy (#16248 )

2021-05-16 23:50:16 +02:00

Vagrantfile

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

2021-05-17 10:30:34 +02:00

yarn.lock

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

2021-07-11 21:41:23 +02:00

README.md

Mastodon Glitch Edition

Now with automated deploys!

So here's the deal: we all work on this code, and then it runs on dev.glitch.social 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%