T

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

Conflicts:
- `.env.production.sample`:
  Upstream added new configuration options, uncommented by default.
  Commented them.
- `Gemfile.lock`:
  Upstream updated dependencies textually close to glitch-soc-specific
  dependencies.
  Updated those upstream dependencies.

2021-10-25 20:28:51 +02:00

.circleci

Improve CircleCI config (#16861 )

2021-10-18 12:05:25 +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-10-25 20:28:51 +02:00

bin

Update Mastodon to Rails 6.1 (#15910 )

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

chart

Update Helm release elasticsearch to v15.10.3 (#16651 )

2021-10-14 21:01:27 +02:00

config

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

2021-10-25 20:28:51 +02:00

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

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

dist

templates/systemd/mastodon: update sandbox mode (#16235 )

2021-10-25 16:31:20 +02:00

lib

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

2021-10-25 20:28:51 +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-10-25 20:28:51 +02:00

streaming

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

2021-10-13 15:50:24 +02:00

vendor

…

.buildpacks

Remove nodejs buildpack from buildpacks (#14364 )

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

.codeclimate.yml

Exclude locale files from Code Climate (#16863 )

2021-10-18 12:04:42 +02: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

New env variable: CAS_SECURITY_ASSUME_EMAIL_IS_VERIFIED (#16655 )

2021-08-25 18:41:24 +02:00

.env.production.sample

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

2021-10-25 20:28:51 +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

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

2021-08-10 22:56:13 +02: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

add bundle flag to suppress root warning (#16557 )

2021-10-14 21:00:38 +02:00

Gemfile

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

2021-10-25 20:28:51 +02:00

Gemfile.lock

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

2021-10-25 20:28:51 +02:00

ide-helper.js

…

LICENSE

…

package.json

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

2021-10-25 20:28:51 +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

add Vagrant short guide to readme (#13009 )

2021-10-14 21:06:19 +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-10-14 22:14:26 +02:00

yarn.lock

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

2021-10-25 20:28:51 +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.