T

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

Conflicts:
- `app/models/custom_emoji.rb`:
  Slight refactor upstream, next to a line that was different in glitch-soc
  because of our local configurable limits on custom emoji size.
  Ported upstream changes.
- `yarn.lock`:
  Not really a conflict, upstream dependency textually too close to a
  glitch-soc-only dependency.
  Updated upstream dependency as upstream.

2021-09-30 00:01:20 +02:00

.circleci

NodeJS 14 support - circleci/docker/.nvmrc (#16163 )

2021-08-10 22:56:13 +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-09-30 00:01:20 +02:00

bin

…

chart

helm: set default SMTP_CA_FILE (#16750 )

2021-09-20 02:23:44 +02:00

config

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

2021-09-30 00:01:20 +02:00

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

2021-08-09 23:25:49 +02:00

dist

Make sure nginx always send HSTS header (#16633 )

2021-08-20 10:54:11 +01:00

lib

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

2021-09-30 00:01:20 +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-09-30 00:01:20 +02:00

streaming

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

2021-09-26 18:28:59 +02:00

vendor

…

.buildpacks

…

.codeclimate.yml

…

.deepsource.toml

…

.dockerignore

Ignore git related files from docker build (#16282 )

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

.editorconfig

…

.env.nanobox

New env variable: CAS_SECURITY_ASSUME_EMAIL_IS_VERIFIED (#16655 )

2021-08-25 18:41:24 +02: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

…

.eslintignore

…

.eslintrc.js

…

.foreman

…

.gitattributes

…

.gitignore

…

.gitmodules

…

.haml-lint.yml

…

.nanoignore

…

.nvmrc

NodeJS 14 support - circleci/docker/.nvmrc (#16163 )

2021-08-10 22:56:13 +02:00

.profile

…

.rspec

…

.rubocop.yml

…

.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

…

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

…

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

Update Dockerfile (#16696 )

2021-09-13 19:03:14 +02:00

Gemfile

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

2021-09-30 00:01:20 +02:00

Gemfile.lock

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

2021-09-30 00:01:20 +02:00

ide-helper.js

…

LICENSE

…

package.json

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

2021-09-30 00:01:20 +02:00

postcss.config.js

…

priv-config

…

Procfile

…

Procfile.dev

…

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-08-11 16:41:59 +02:00

yarn.lock

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

2021-09-30 00:01:20 +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%