T

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

Conflicts:
- `app/javascript/packs/public.js`:
  Conflict because part of that file has been split to
  `app/javascript/core/settings.js`. Ported those changes
  there.

2020-07-01 19:23:14 +02:00

.circleci

…

.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-07-01 19:23:14 +02:00

bin

…

chart

Add Helm chart (#14090 )

2020-06-29 13:58:48 +02:00

config

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

2020-07-01 19:23:14 +02:00

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

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

dist

…

lib

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

2020-07-01 19:23:14 +02:00

log

…

nanobox

…

public

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

2020-06-09 10:39:20 +02:00

spec

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

2020-07-01 19:23:14 +02:00

streaming

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

2020-06-26 13:02:14 +02:00

vendor

…

.buildpacks

…

.codeclimate.yml

…

.dockerignore

…

.editorconfig

…

.env.nanobox

…

.env.production.sample

Use allow/deny-list instead of white/black-list in .env.production.sample

2020-06-30 23:32:02 +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

…

.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

…

.ruby-version

…

.sass-lint.yml

…

.slugignore

…

.yarnclean

…

app.json

…

Aptfile

…

AUTHORS.md

…

babel.config.js

…

boxfile.yml

…

Capfile

…

CHANGELOG.md

…

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

Update Dockerfile (#13582 )

2020-06-25 12:17:53 +02:00

Gemfile

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

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

Gemfile.lock

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

2020-07-01 19:23:14 +02:00

ide-helper.js

…

LICENSE

…

package.json

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

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

postcss.config.js

…

priv-config

…

Procfile

…

Procfile.dev

…

Rakefile

…

README.md

…

scalingo.json

…

SECURITY.md

Add Security Policy (#13946 )

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

Vagrantfile

…

yarn.lock

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

2020-06-30 23:00: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%