Go to file

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

Conflicts:
- `.env.production.sample`:
  Copied upstream changes.
- `app/controllers/settings/identity_proofs_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `app/controllers/well_known/keybase_proof_config_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `lib/mastodon/statuses_cli.rb`:
  Minor conflict due to an optimization that wasn't shared between
  the two versions. Copied upstream's version.

2021-11-26 22:53:55 +01:00

.circleci

Ruby 3.0.2 Upgrade (#16982 )

2021-11-18 21:59:57 +01:00

.github

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

2021-11-25 18:42:18 +01:00

app

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

2021-11-26 22:53:55 +01: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-11-26 22:53:55 +01:00

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

2021-11-26 22:53:55 +01: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-11-26 22:53:55 +01:00

log

…

nanobox

Resync Nanobox files with the 2.9.0 release (#11083 )

2019-06-14 14:52:31 +02:00

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-11-26 22:53:55 +01:00

streaming

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

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

vendor

Increase files checked by ESLint (#9705 )

2019-01-04 11:28:38 +01:00

.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

Fix ElasticSearch to Elasticsearch (#17050 )

2021-11-26 08:30:02 +01:00

.env.production.sample

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

2021-11-26 22:53:55 +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

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

Upgrade Ruby to 3.0.3 (#17038 )

2021-11-24 20:29:05 +01:00

.sass-lint.yml

Fix sass-lint config (#10982 )

2019-06-06 18:51:46 +02:00

.slugignore

…

.yarnclean

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

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

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

Forward port version bumps to 3.4.2 and 3.4.3 (#16945 )

2021-11-06 05:32:14 +01:00

CODE_OF_CONDUCT.md

Change e-mail contact for CoC enforcement

2019-06-06 17:42:07 +02:00

config.ru

…

CONTRIBUTING.md

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

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

crowdin.yml

Update Crowdin configuration file

2019-09-14 11:40:13 +02:00

docker-compose.yml

[Docker-Compose] [Breaking] Postgres 9.6 is EOL (11th Nov 2021) - Migrate to 14 Stable (#16947 )

2021-11-18 22:00:27 +01:00

Dockerfile

Upgrade Ruby to 3.0.3 (#17038 )

2021-11-24 20:29:05 +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

2021-11-26 22:53:55 +01:00

Gemfile.lock

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

2021-11-26 22:53:55 +01: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-11-26 22:53:55 +01:00

postcss.config.js

Increase files checked by ESLint (#9705 )

2019-01-04 11:28:38 +01:00

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-11-26 22:53:55 +01: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 47.6%

JavaScript 23.7%

TypeScript 14.7%

SCSS 8.8%

Haml 3.2%

Other 2%