Go to file

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

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-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

fix: make Procfile compatible with herokuish (#12685 )

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

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

Update nginx.conf (#13066 )

2020-03-08 16:04:25 +01:00

lib

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

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

Remove nodejs buildpack from buildpacks (#14364 )

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

.codeclimate.yml

Removed disabling comments for Style/MethodMissingSuper (#15014 )

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

.dockerignore

…

.editorconfig

…

.env.nanobox

Fix sample SAML_ACS_URL, SAML_ISSUER (#12669 )

2019-12-23 18:12:22 +01:00

.env.production.sample

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

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

…

.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

Upgrade .nvmrc to Node.js 12 (#12906 )

2020-01-21 12:42:13 +01:00

.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

Use Ruby 2.7.2 (#15150 )

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

.sass-lint.yml

Fix sass-lint config (#10982 )

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

.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

Remove unnecessary dependencies (#12533 )

2019-12-02 13:38:53 +01: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

Fix changelog containing items from 3.2.1 twice (#15255 )

2020-12-01 06:45:58 +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 'master' into glitch-soc/merge-upstream

2019-11-20 15:36:09 +01:00

crowdin.yml

Update Crowdin configuration file

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

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 (#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

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-12-05 17:33:37 +01: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

Remove deprecated config from Heroku and Scalingo (#11925 )

2019-09-23 12:11:59 +02:00

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-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 47.6%

JavaScript 23.7%

TypeScript 14.7%

SCSS 8.8%

Haml 3.2%

Other 2%