T

Thibaut Girka e5f934ddf0 Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Conflict caused because we have additional code to make sure pinned
  local-only toots don't get rendered on the ActivityPub endpoints.
  Ported upstream changes.

2020-09-07 09:21:38 +02:00

.circleci

Set bundle config in local file, and set path (#14351 )

2020-07-18 19:00:59 +02:00

.github

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

2020-06-30 23:00:20 +02:00

app

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

2020-09-07 09:21:38 +02:00

bin

fix: make Procfile compatible with herokuish (#12685 )

2020-08-29 19:00:30 +02:00

chart

helm: bump default image tag to v3.2.0 (#14476 )

2020-08-02 11:20:31 +02:00

config

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

2020-09-07 09:21:38 +02:00

Add configuration option to filter replies in lists (#9205 )

2020-09-01 13:31:28 +02:00

dist

…

lib

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

2020-09-07 09:21:38 +02:00

log

…

nanobox

…

public

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

2020-09-01 17:02:18 +02:00

spec

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

2020-09-07 09:21:38 +02:00

streaming

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

2020-08-13 22:17:29 +02:00

vendor

…

.buildpacks

Remove nodejs buildpack from buildpacks (#14364 )

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

.codeclimate.yml

Bump rubocop from 0.86.0 to 0.88.0 (#14412 )

2020-09-01 03:04:00 +02:00

.dockerignore

…

.editorconfig

…

.env.nanobox

…

.env.production.sample

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

2020-07-15 15:32:40 +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

Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191 )

2020-07-01 19:05:21 +02:00

.gitmodules

…

.haml-lint.yml

…

.nanoignore

…

.nvmrc

…

.profile

…

.rspec

…

.rubocop.yml

Bump rubocop from 0.86.0 to 0.88.0 (#14412 )

2020-09-01 03:04:00 +02:00

.ruby-version

Update .ruby-version (#13395 )

2020-04-05 13:58:43 +02:00

.sass-lint.yml

…

.slugignore

…

.yarnclean

…

app.json

Stop using heroku-buildpack-nodejs (#14341 )

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

Aptfile

Stop installing libssl-dev for build (#14660 )

2020-08-25 01:20:59 +02:00

AUTHORS.md

Update translators (#14374 )

2020-07-22 23:08:27 +02:00

babel.config.js

…

boxfile.yml

…

Capfile

…

CHANGELOG.md

Bump version to 3.2.0 (#14395 )

2020-07-27 00:07:26 +02:00

CODE_OF_CONDUCT.md

…

config.ru

…

CONTRIBUTING.md

…

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

Minor fix & improvement for the Dockerfile (#14686 )

2020-08-30 16:45:49 +02:00

Gemfile

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

2020-09-01 17:02:18 +02:00

Gemfile.lock

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

2020-09-01 17:02:18 +02:00

ide-helper.js

Add JS IDE helper (#13012 )

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

LICENSE

…

package.json

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

2020-09-01 17:02:18 +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

…

Rakefile

…

README.md

Fix translation platform to Crowdin (#13443 )

2020-04-10 08:24:23 +02:00

scalingo.json

…

SECURITY.md

Add Security Policy (#13946 )

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

Vagrantfile

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

2020-04-04 21:47:37 +02:00

yarn.lock

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

2020-09-01 17:02:18 +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%