T

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

Conflicts:
- `app/models/form/admin_settings.rb`:
  New setting added upstream. Ported it.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream removed RTL classes. Did the same.
- `config/settings.yml`:
  New setting added upstream. Ported it.

2020-12-15 14:27:06 +01:00

.circleci

…

.github

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

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

app

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

2020-12-15 14:27:06 +01:00

bin

…

chart

Fix postrgres secret name for cronjob (#15072 )

2020-11-02 06:16:51 +01:00

config

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

2020-12-15 14:27:06 +01:00

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

2020-12-15 14:27:06 +01:00

dist

…

lib

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

2020-12-15 14:27:06 +01:00

log

…

nanobox

…

public

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

2020-12-15 14:27:06 +01:00

spec

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

2020-12-15 14:27:06 +01:00

streaming

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

2020-11-25 15:31:45 +01:00

vendor

…

.buildpacks

…

.codeclimate.yml

…

.dockerignore

…

.editorconfig

…

.env.nanobox

…

.env.production.sample

…

.env.test

…

.env.vagrant

…

.eslintignore

…

.eslintrc.js

…

.foreman

…

.gitattributes

…

.gitignore

…

.gitmodules

…

.haml-lint.yml

…

.nanoignore

…

.nvmrc

…

.profile

…

.rspec

…

.rubocop.yml

…

.ruby-version

Use Ruby 2.7.2 (#15150 )

2020-11-19 17:46:46 +01:00

.sass-lint.yml

…

.slugignore

…

.yarnclean

…

app.json

…

Aptfile

…

AUTHORS.md

…

babel.config.js

…

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

Fix changelog containing items from 3.2.1 twice (#15255 )

2020-12-01 06:45:58 +01:00

CODE_OF_CONDUCT.md

…

config.ru

…

CONTRIBUTING.md

…

crowdin.yml

…

docker-compose.yml

…

Dockerfile

Update Dockerfile (#15232 )

2020-11-29 09:20:02 +01:00

Gemfile

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

2020-12-15 14:27:06 +01:00

Gemfile.lock

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

2020-12-15 14:27:06 +01:00

ide-helper.js

…

LICENSE

…

package.json

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

2020-12-05 17:33:37 +01:00

postcss.config.js

…

priv-config

…

Procfile

…

Procfile.dev

…

Rakefile

…

README.md

…

scalingo.json

…

SECURITY.md

…

Vagrantfile

…

yarn.lock

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

2020-12-15 14:27:06 +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 57.6%

JavaScript 26.6%

SCSS 10%

Haml 5.5%

HTML 0.2%