Go to file

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

Conflicts:
- `app/models/public_feed.rb`:
  Upstream refactored a bit, glitch-soc had specific code for local-only
  statuses.
  Updated glitch-soc's specific code accordingly.

2021-01-11 11:55:42 +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

2021-01-11 11:55:42 +01:00

bin

fix: make Procfile compatible with herokuish (#12685 )

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

chart

Forward-port v3.2.2 changelog (#15370 )

2020-12-19 03:13:50 +01:00

config

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

2021-01-11 11:55:42 +01:00

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

2020-12-19 00:55:12 +01:00

dist

Set X-Forwarded-Proto to request scheme (#15310 ) (#15498 )

2021-01-05 22:25:07 +01:00

lib

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

2021-01-11 11:55:42 +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

2021-01-11 11:55:42 +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

update codeclimate-rubocop (#15500 )

2021-01-06 07:49:48 +01: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

Fix rubocop config and warnings (#15503 )

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

.ruby-version

Use Ruby 2.7.2 (#15150 )

2020-11-19 17:46:46 +01: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

Bump version to 3.3.0 (#15433 )

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

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 'master' into glitch-soc/merge-upstream

2019-11-20 15:36:09 +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

Fix the Dockerfile in case of Kaniko build (#15510 )

2021-01-08 07:13:26 +01:00

Gemfile

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

2021-01-11 11:55:42 +01:00

Gemfile.lock

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

2021-01-11 11:55:42 +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

2021-01-11 11:55:42 +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

Set RAILS_ENV in Procfile.dev (#15502 )

2021-01-07 09:30:12 +01:00

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

2021-01-11 11:55:42 +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%