Mirror of glitch-soc/mastodon@github.com
Go to file
Thibaut Girka 0437d70628 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
  Conflict due to upstream changing suspension logic while
  glitch-soc has an extra option to hide followers count.
  Ported upstream changes.
2020-11-08 14:20:35 +01:00
.circleci Set bundle config in local file, and set path (#14351) 2020-07-18 19:00:59 +02:00
.github Exclude dependency updates other than direct dependencies (#14944) 2020-10-06 19:16:30 +02:00
app Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +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-11-07 18:23:02 +01:00
db Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +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-11-08 14:20:35 +01:00
log
nanobox
public Merge branch 'master' into glitch-soc/merge-upstream 2020-09-28 14:13:30 +02:00
spec Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
streaming Merge branch 'master' into glitch-soc/merge-upstream 2020-09-28 14:13:30 +02: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 Update .ruby-version (#13395) 2020-04-05 13:58:43 +02:00
.sass-lint.yml
.slugignore
.yarnclean
AUTHORS.md Update translators (#14374) 2020-07-22 23:08:27 +02:00
Aptfile Stop installing libssl-dev for build (#14660) 2020-08-25 01:20:59 +02:00
CHANGELOG.md Bump version to 3.2.0 (#14395) 2020-07-27 00:07:26 +02:00
CODE_OF_CONDUCT.md
CONTRIBUTING.md Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
Capfile
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-10-26 15:48:16 +01:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00
LICENSE
Procfile fix: make Procfile compatible with herokuish (#12685) 2020-08-29 19:00:30 +02:00
Procfile.dev
README.md Fix translation platform to Crowdin (#13443) 2020-04-10 08:24:23 +02:00
Rakefile
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
app.json Stop using heroku-buildpack-nodejs (#14341) 2020-07-16 22:01:34 +02:00
babel.config.js Remove unnecessary dependencies (#12533) 2019-12-02 13:38:53 +01:00
boxfile.yml Correct the Nanobox deploy hooks for order and context (#12663) 2019-12-22 08:55:27 +01:00
config.ru
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
ide-helper.js Add JS IDE helper (#13012) 2020-04-27 17:19:53 +02:00
package.json Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00
postcss.config.js
priv-config
scalingo.json Remove deprecated config from Heroku and Scalingo (#11925) 2019-09-23 12:11:59 +02:00
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00

README.md

Mastodon Glitch Edition

Now with automated deploys!

Build Status

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?