Go to file

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

- `app/views/statuses/_simple_status.html.haml`:
  Small markup change in glitch-soc, on a line that has been modified by
  upstream. Ported upstream changes.

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

.circleci

Add Ruby 3.0 support (#16046 )

2021-05-06 14:22:54 +02:00

.github

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

2020-11-20 13:27:48 +01:00

app

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

2021-05-07 18:21:59 +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-05-07 18:21:59 +02:00

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

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

dist

templates/systemd/mastodon: optimize SystemCallFilters (#16127 )

2021-04-27 20:34:53 +02:00

lib

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

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

log

…

nanobox

…

public

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

2021-04-20 12:17:14 +02:00

spec

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

2021-05-07 18:21:59 +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

dockerignore helm chart (#15747 )

2021-02-19 09:57:03 +01:00

.editorconfig

…

.env.nanobox

…

.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

…

.profile

…

.rspec

…

.rubocop.yml

Fix rubocop config and warnings (#15503 )

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

.ruby-version

Revert default Ruby version to 2.7.2 (#16154 )

2021-05-04 23:06:19 +02:00

.sass-lint.yml

…

.slugignore

…

.yarnclean

…

app.json

Stop using heroku-buildpack-nodejs (#14341 )

2020-07-16 22:01:34 +02:00

Aptfile

Use libvpx >= 5 (#15591 )

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

AUTHORS.md

Bump version to 3.3.0 (#15433 )

2020-12-27 06:00:55 +01: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

Bump version to 3.3.0 (#15433 )

2020-12-27 06:00:55 +01:00

CODE_OF_CONDUCT.md

…

config.ru

…

CONTRIBUTING.md

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

2021-01-26 14:01:30 +01:00

crowdin.yml

…

docker-compose.yml

Update Elasticsearch from 6.1 to 6.8 in docker-compose.yml (Fix glitch-soc#1348) (#14016 )

2020-06-10 13:57:30 +02:00

Dockerfile

Revert default Ruby version to 2.7.2 (#16154 )

2021-05-04 23:06:19 +02:00

Gemfile

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

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

Gemfile.lock

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

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

ide-helper.js

…

LICENSE

…

package.json

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

2021-05-07 18:21:59 +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

Update copyright year (#16003 )

2021-04-06 11:38:21 +02:00

scalingo.json

…

SECURITY.md

Add Security Policy (#13946 )

2020-06-03 08:32:23 +02:00

Vagrantfile

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

2021-02-12 10:28:32 +01:00

yarn.lock

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

2021-05-07 18:21:59 +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%